2020-08-23 13:54:52

by Sumera Priyadarsini

Subject: [PATCH] net: ocelot: Add of_node_put() before return statement

Every iteration of for_each_available_child_of_node() decrements
the reference count of the previous node, however when control
is transferred from the middle of the loop, as in the case of
a return or break or goto, there is no decrement thus ultimately
resulting in a memory leak.

Fix a potential memory leak in felix.c by inserting of_node_put()
before the return statement.

Issue found with Coccinelle.

Signed-off-by: Sumera Priyadarsini <[email protected]>
---
drivers/net/dsa/ocelot/felix.c | 1 +
1 file changed, 1 insertion(+)

diff --git a/drivers/net/dsa/ocelot/felix.c b/drivers/net/dsa/ocelot/felix.c
index c69d9592a2b7..04bfa6e465ff 100644
--- a/drivers/net/dsa/ocelot/felix.c
+++ b/drivers/net/dsa/ocelot/felix.c
@@ -400,6 +400,7 @@ static int felix_parse_ports_node(struct felix *felix,
if (err < 0) {
dev_err(dev, "Unsupported PHY mode %s on port %d\n",
phy_modes(phy_mode), port);
+ of_node_put(child);
return err;
}

--
2.17.1

2020-08-25 01:05:44

by David Miller

Subject: Re: [PATCH] net: ocelot: Add of_node_put() before return statement

From: Sumera Priyadarsini <[email protected]>
Date: Sun, 23 Aug 2020 19:22:45 +0530

> Every iteration of for_each_available_child_of_node() decrements
> the reference count of the previous node, however when control
> is transferred from the middle of the loop, as in the case of
> a return or break or goto, there is no decrement thus ultimately
> resulting in a memory leak.
>
> Fix a potential memory leak in felix.c by inserting of_node_put()
> before the return statement.
>
> Issue found with Coccinelle.
>
> Signed-off-by: Sumera Priyadarsini <[email protected]>

Applied.