| Message ID | 20190709172454.13648-1-nishkadg.linux@gmail.com (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | 22ff7d4ca3f748e3b685fd2385afda18b9fa0258 |
| Headers | show |
| Series | media: platform: mtk-mdp: mtk_mdp_core: Add of_node_put() before goto | expand |
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>
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);
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(-)