| Message ID | 20190804162201.5838-1-nishkadg.linux@gmail.com (mailing list archive) |
|---|---|
| State | Not Applicable, archived |
| Delegated to: | Andy Gross |
| Headers | show |
| Series | slimbus: qcom-ngd-ctrl: Add of_node_put() before return | expand |
On Sun 04 Aug 09:22 PDT 2019, Nishka Dasgupta wrote: > Each iteration of for_each_available_child_of_node puts the previous > node, but in the case of a return from the middle of the loop, there is > no put, thus causing a memory leak. Hence add an of_node_put before the > return in two places. > Issue found with Coccinelle. > Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org> > Signed-off-by: Nishka Dasgupta <nishkadg.linux@gmail.com> > --- > drivers/slimbus/qcom-ngd-ctrl.c | 5 ++++- > 1 file changed, 4 insertions(+), 1 deletion(-) > > diff --git a/drivers/slimbus/qcom-ngd-ctrl.c b/drivers/slimbus/qcom-ngd-ctrl.c > index f3585777324c..29fbab55c3b3 100644 > --- a/drivers/slimbus/qcom-ngd-ctrl.c > +++ b/drivers/slimbus/qcom-ngd-ctrl.c > @@ -1338,12 +1338,15 @@ static int of_qcom_slim_ngd_register(struct device *parent, > continue; > > ngd = kzalloc(sizeof(*ngd), GFP_KERNEL); > - if (!ngd) > + if (!ngd) { > + of_node_put(node); > return -ENOMEM; > + } > > ngd->pdev = platform_device_alloc(QCOM_SLIM_NGD_DRV_NAME, id); > if (!ngd->pdev) { > kfree(ngd); > + of_node_put(node); > return -ENOMEM; > } > ngd->id = id; > -- > 2.19.1 >
On 04/08/2019 17:22, Nishka Dasgupta wrote: > Each iteration of for_each_available_child_of_node puts the previous > node, but in the case of a return from the middle of the loop, there is > no put, thus causing a memory leak. Hence add an of_node_put before the > return in two places. > Issue found with Coccinelle. > > Signed-off-by: Nishka Dasgupta <nishkadg.linux@gmail.com> > --- > drivers/slimbus/qcom-ngd-ctrl.c | 5 ++++- > 1 file changed, 4 insertions(+), 1 deletion(-) Applied Thanks, --srini
diff --git a/drivers/slimbus/qcom-ngd-ctrl.c b/drivers/slimbus/qcom-ngd-ctrl.c index f3585777324c..29fbab55c3b3 100644 --- a/drivers/slimbus/qcom-ngd-ctrl.c +++ b/drivers/slimbus/qcom-ngd-ctrl.c @@ -1338,12 +1338,15 @@ static int of_qcom_slim_ngd_register(struct device *parent, continue; ngd = kzalloc(sizeof(*ngd), GFP_KERNEL); - if (!ngd) + if (!ngd) { + of_node_put(node); return -ENOMEM; + } ngd->pdev = platform_device_alloc(QCOM_SLIM_NGD_DRV_NAME, id); if (!ngd->pdev) { kfree(ngd); + of_node_put(node); return -ENOMEM; } ngd->id = id;
Each iteration of for_each_available_child_of_node puts the previous node, but in the case of a return from the middle of the loop, there is no put, thus causing a memory leak. Hence add an of_node_put before the return in two places. Issue found with Coccinelle. Signed-off-by: Nishka Dasgupta <nishkadg.linux@gmail.com> --- drivers/slimbus/qcom-ngd-ctrl.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)