* [PATCH] media: platform: mtk-mdp: mtk_mdp_core: Add of_node_put() before goto
@ 2019-07-09 17:24 Nishka Dasgupta
2019-07-12 7:37 ` houlong wei
0 siblings, 1 reply; 2+ messages in thread
From: Nishka Dasgupta @ 2019-07-09 17:24 UTC (permalink / raw)
To: minghsiu.tsai, houlong.wei, andrew-ct.chen, mchehab,
matthias.bgg, linux-media, linux-arm-kernel, linux-mediatek
Cc: Nishka Dasgupta
Each iteration of for_each_child_of_node puts the previous node, but in
the case of a goto from the middle of the loop, there is no put, thus
causing a memory leak. Hence add an of_node_put before the goto in two
places.
Issue found with Coccinelle.
Signed-off-by: Nishka Dasgupta <nishkadg.linux@gmail.com>
---
drivers/media/platform/mtk-mdp/mtk_mdp_core.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/drivers/media/platform/mtk-mdp/mtk_mdp_core.c b/drivers/media/platform/mtk-mdp/mtk_mdp_core.c
index fc9faec85edb..d0a3f06ad83d 100644
--- a/drivers/media/platform/mtk-mdp/mtk_mdp_core.c
+++ b/drivers/media/platform/mtk-mdp/mtk_mdp_core.c
@@ -145,13 +145,16 @@ static int mtk_mdp_probe(struct platform_device *pdev)
comp = devm_kzalloc(dev, sizeof(*comp), GFP_KERNEL);
if (!comp) {
ret = -ENOMEM;
+ of_node_put(node);
goto err_comp;
}
mdp->comp[comp_id] = comp;
ret = mtk_mdp_comp_init(dev, node, comp, comp_id);
- if (ret)
+ if (ret) {
+ of_node_put(node);
goto err_comp;
+ }
}
mdp->job_wq = create_singlethread_workqueue(MTK_MDP_MODULE_NAME);
--
2.19.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] media: platform: mtk-mdp: mtk_mdp_core: Add of_node_put() before goto
2019-07-09 17:24 [PATCH] media: platform: mtk-mdp: mtk_mdp_core: Add of_node_put() before goto Nishka Dasgupta
@ 2019-07-12 7:37 ` houlong wei
0 siblings, 0 replies; 2+ messages in thread
From: houlong wei @ 2019-07-12 7:37 UTC (permalink / raw)
To: Nishka Dasgupta
Cc: houlong.wei, Minghsiu Tsai (蔡明修),
Andrew-CT Chen (陳智迪),
mchehab, matthias.bgg, linux-media, linux-arm-kernel,
linux-mediatek
On Wed, 2019-07-10 at 01:24 +0800, Nishka Dasgupta wrote:
> Each iteration of for_each_child_of_node puts the previous node, but in
> the case of a goto from the middle of the loop, there is no put, thus
> causing a memory leak. Hence add an of_node_put before the goto in two
> places.
> Issue found with Coccinelle.
>
> Signed-off-by: Nishka Dasgupta <nishkadg.linux@gmail.com>
> ---
> drivers/media/platform/mtk-mdp/mtk_mdp_core.c | 5 ++++-
> 1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/media/platform/mtk-mdp/mtk_mdp_core.c b/drivers/media/platform/mtk-mdp/mtk_mdp_core.c
> index fc9faec85edb..d0a3f06ad83d 100644
> --- a/drivers/media/platform/mtk-mdp/mtk_mdp_core.c
> +++ b/drivers/media/platform/mtk-mdp/mtk_mdp_core.c
> @@ -145,13 +145,16 @@ static int mtk_mdp_probe(struct platform_device *pdev)
> comp = devm_kzalloc(dev, sizeof(*comp), GFP_KERNEL);
> if (!comp) {
> ret = -ENOMEM;
> + of_node_put(node);
> goto err_comp;
> }
> mdp->comp[comp_id] = comp;
>
> ret = mtk_mdp_comp_init(dev, node, comp, comp_id);
> - if (ret)
> + if (ret) {
> + of_node_put(node);
> goto err_comp;
> + }
> }
>
> mdp->job_wq = create_singlethread_workqueue(MTK_MDP_MODULE_NAME);
Thanks Nishka for fixing the bug.
Acked-by: Houlong Wei <houlong.wei@mediatek.com>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2019-07-12 7:37 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-07-09 17:24 [PATCH] media: platform: mtk-mdp: mtk_mdp_core: Add of_node_put() before goto Nishka Dasgupta
2019-07-12 7:37 ` houlong wei
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).