OSDN Git Service

net: ethernet: mscc: ocelot_board: Add of_node_put() before return
authorNishka Dasgupta <nishkadg.linux@gmail.com>
Tue, 16 Jul 2019 05:52:19 +0000 (11:22 +0530)
committerDavid S. Miller <davem@davemloft.net>
Tue, 16 Jul 2019 19:38:17 +0000 (12:38 -0700)
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>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/mscc/ocelot_board.c

index 58bde1a..2451d4a 100644 (file)
@@ -291,8 +291,10 @@ static int mscc_ocelot_probe(struct platform_device *pdev)
                        continue;
 
                err = ocelot_probe_port(ocelot, port, regs, phy);
-               if (err)
+               if (err) {
+                       of_node_put(portnp);
                        return err;
+               }
 
                phy_mode = of_get_phy_mode(portnp);
                if (phy_mode < 0)
@@ -318,6 +320,7 @@ static int mscc_ocelot_probe(struct platform_device *pdev)
                        dev_err(ocelot->dev,
                                "invalid phy mode for port%d, (Q)SGMII only\n",
                                port);
+                       of_node_put(portnp);
                        return -EINVAL;
                }