]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
ata: libahci_platform: Add of_node_put() before loop exit
authorNishka Dasgupta <nishkadg.linux@gmail.com>
Thu, 15 Aug 2019 06:00:14 +0000 (11:30 +0530)
committerJens Axboe <axboe@kernel.dk>
Thu, 19 Sep 2019 18:21:44 +0000 (12:21 -0600)
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. Add an of_node_put before three such goto
statements.
Issue found with Coccinelle.

Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Nishka Dasgupta <nishkadg.linux@gmail.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
drivers/ata/libahci_platform.c

index 9e9583a6bba99295601cc92399c94e85f623cef3..e742780950de84c330c2c83b1daf1a0905f03ed0 100644 (file)
@@ -497,6 +497,7 @@ struct ahci_host_priv *ahci_platform_get_resources(struct platform_device *pdev,
 
                        if (of_property_read_u32(child, "reg", &port)) {
                                rc = -EINVAL;
+                               of_node_put(child);
                                goto err_out;
                        }
 
@@ -514,14 +515,18 @@ struct ahci_host_priv *ahci_platform_get_resources(struct platform_device *pdev,
                        if (port_dev) {
                                rc = ahci_platform_get_regulator(hpriv, port,
                                                                &port_dev->dev);
-                               if (rc == -EPROBE_DEFER)
+                               if (rc == -EPROBE_DEFER) {
+                                       of_node_put(child);
                                        goto err_out;
+                               }
                        }
 #endif
 
                        rc = ahci_platform_get_phy(hpriv, port, dev, child);
-                       if (rc)
+                       if (rc) {
+                               of_node_put(child);
                                goto err_out;
+                       }
 
                        enabled_ports++;
                }