diff options
| author |   Nishka Dasgupta <nishkadg.linux@gmail.com> | 2019-08-04 21:00:18 +0530 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2019-08-06 14:35:13 -0700 |
| commit | f26e0cca14c9494c863d8fa6825b10bd12dc9eaa (patch) | |
| tree | eec432e5613dcf4d48a61c067f716bee990cd67e /drivers/net/dsa/qca8k.c | |
| parent | Merge branch 'flow_offload-action-fixes' (diff) | |
| download | linux-dev-f26e0cca14c9494c863d8fa6825b10bd12dc9eaa.tar.xz linux-dev-f26e0cca14c9494c863d8fa6825b10bd12dc9eaa.zip | |
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: Nishka Dasgupta <nishkadg.linux@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to '')
| -rw-r--r-- | drivers/net/dsa/qca8k.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/net/dsa/qca8k.c b/drivers/net/dsa/qca8k.c index e429e92dedf4..16f15c93a102 100644 --- a/drivers/net/dsa/qca8k.c +++ b/drivers/net/dsa/qca8k.c @@ -583,8 +583,11 @@ qca8k_setup_mdio_bus(struct qca8k_priv *priv) for_each_available_child_of_node(ports, port) { err = of_property_read_u32(port, "reg", ®); - if (err) + if (err) { + of_node_put(port); + of_node_put(ports); return err; + } if (!dsa_is_user_port(priv->ds, reg)) continue; @@ -595,6 +598,7 @@ qca8k_setup_mdio_bus(struct qca8k_priv *priv) internal_mdio_mask |= BIT(reg); } + of_node_put(ports); if (!external_mdio_mask && !internal_mdio_mask) { dev_err(priv->dev, "no PHYs are defined.\n"); return -EINVAL; |