]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
slimbus: qcom-ngd-ctrl: Add of_node_put() before return
authorNishka Dasgupta <nishkadg.linux@gmail.com>
Sun, 18 Aug 2019 09:39:01 +0000 (10:39 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 18 Aug 2019 10:56:10 +0000 (12:56 +0200)
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>
Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Link: https://lore.kernel.org/r/20190818093902.29993-2-srinivas.kandagatla@linaro.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/slimbus/qcom-ngd-ctrl.c

index f3585777324cf20e87a28d1dca15a941959eb136..29fbab55c3b38051a7214efd1795035658ec8a56 100644 (file)
@@ -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;