Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7ba771e3 authored by Nishka Dasgupta's avatar Nishka Dasgupta Committed by David S. Miller
Browse files

net: dsa: sja1105: sja1105_main: Add of_node_put() 



Each iteration of for_each_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.
Issue found with Coccinelle.

Signed-off-by: default avatarNishka Dasgupta <nishkadg.linux@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 78e42040

drivers/net/dsa/sja1105/sja1105_main.c

+3 −0
Original line number Diff line number Diff line
@@ -625,6 +625,7 @@ static int sja1105_parse_ports_node(struct sja1105_private *priv, 
		if (of_property_read_u32(child, "reg", &index) < 0) {

			dev_err(dev, "Port number not defined in device tree "

				"(property \"reg\")\n");

			of_node_put(child);

			return -ENODEV;

		}
@@ -634,6 +635,7 @@ static int sja1105_parse_ports_node(struct sja1105_private *priv, 
			dev_err(dev, "Failed to read phy-mode or "

				"phy-interface-type property for port %d\n",

				index);

			of_node_put(child);

			return -ENODEV;

		}

		ports[index].phy_mode = phy_mode;
@@ -643,6 +645,7 @@ static int sja1105_parse_ports_node(struct sja1105_private *priv, 
			if (!of_phy_is_fixed_link(child)) {

				dev_err(dev, "phy-handle or fixed-link "

					"properties missing!\n");

				of_node_put(child);

				return -ENODEV;

			}

			/* phy-handle is missing, but fixed-link isn't.