* [PATCH] slimbus: qcom-ngd-ctrl: Add of_node_put() before return
@ 2019-08-04 16:22 Nishka Dasgupta
2019-08-05 22:49 ` Bjorn Andersson
2019-08-06 8:40 ` Srinivas Kandagatla
0 siblings, 2 replies; 3+ messages in thread
From: Nishka Dasgupta @ 2019-08-04 16:22 UTC (permalink / raw)
To: agross, srinivas.kandagatla, linux-arm-msm, alsa-devel; +Cc: Nishka Dasgupta
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(-)
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
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] slimbus: qcom-ngd-ctrl: Add of_node_put() before return
2019-08-04 16:22 [PATCH] slimbus: qcom-ngd-ctrl: Add of_node_put() before return Nishka Dasgupta
@ 2019-08-05 22:49 ` Bjorn Andersson
2019-08-06 8:40 ` Srinivas Kandagatla
1 sibling, 0 replies; 3+ messages in thread
From: Bjorn Andersson @ 2019-08-05 22:49 UTC (permalink / raw)
To: Nishka Dasgupta; +Cc: agross, srinivas.kandagatla, linux-arm-msm, alsa-devel
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
>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] slimbus: qcom-ngd-ctrl: Add of_node_put() before return
2019-08-04 16:22 [PATCH] slimbus: qcom-ngd-ctrl: Add of_node_put() before return Nishka Dasgupta
2019-08-05 22:49 ` Bjorn Andersson
@ 2019-08-06 8:40 ` Srinivas Kandagatla
1 sibling, 0 replies; 3+ messages in thread
From: Srinivas Kandagatla @ 2019-08-06 8:40 UTC (permalink / raw)
To: Nishka Dasgupta, agross, linux-arm-msm, alsa-devel
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
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2019-08-06 8:40 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-08-04 16:22 [PATCH] slimbus: qcom-ngd-ctrl: Add of_node_put() before return Nishka Dasgupta
2019-08-05 22:49 ` Bjorn Andersson
2019-08-06 8:40 ` Srinivas Kandagatla
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).