Commit f26e0cca authored by Nishka Dasgupta's avatar Nishka Dasgupta Committed by David S. Miller

net: dsa: qca8k: Add of_node_put() in qca8k_setup_mdio_bus()

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.
Additionally, the local variable ports in the function
qca8k_setup_mdio_bus() takes the return value of of_get_child_by_name(),
which gets a node but does not put it. If the function returns without
putting ports, it may cause a memory leak. Hence put ports before the
mid-loop return statement, and also outside the loop after its last usage
in this function.
Issues found with Coccinelle.
Signed-off-by: default avatarNishka Dasgupta <nishkadg.linux@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 443bfb4a
...@@ -583,8 +583,11 @@ qca8k_setup_mdio_bus(struct qca8k_priv *priv) ...@@ -583,8 +583,11 @@ qca8k_setup_mdio_bus(struct qca8k_priv *priv)
for_each_available_child_of_node(ports, port) { for_each_available_child_of_node(ports, port) {
err = of_property_read_u32(port, "reg", &reg); err = of_property_read_u32(port, "reg", &reg);
if (err) if (err) {
of_node_put(port);
of_node_put(ports);
return err; return err;
}
if (!dsa_is_user_port(priv->ds, reg)) if (!dsa_is_user_port(priv->ds, reg))
continue; continue;
...@@ -595,6 +598,7 @@ qca8k_setup_mdio_bus(struct qca8k_priv *priv) ...@@ -595,6 +598,7 @@ qca8k_setup_mdio_bus(struct qca8k_priv *priv)
internal_mdio_mask |= BIT(reg); internal_mdio_mask |= BIT(reg);
} }
of_node_put(ports);
if (!external_mdio_mask && !internal_mdio_mask) { if (!external_mdio_mask && !internal_mdio_mask) {
dev_err(priv->dev, "no PHYs are defined.\n"); dev_err(priv->dev, "no PHYs are defined.\n");
return -EINVAL; return -EINVAL;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment