* [PATCH V4] net: dsa: mt7530: Add of_node_put() before break and return statements
@ 2020-08-24 20:03 ` Sumera Priyadarsini
0 siblings, 0 replies; 6+ messages in thread
From: Sumera Priyadarsini @ 2020-08-24 20:03 UTC (permalink / raw)
To: davem
Cc: Julia.Lawall, andrew, sean.wang, vivien.didelot, f.fainelli,
kuba, matthias.bgg, netdev, linux-arm-kernel, linux-mediatek,
linux-kernel
Every iteration of for_each_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 mt7530.c by inserting of_node_put()
before the break and return statements.
Issue found with Coccinelle.
Signed-off-by: Sumera Priyadarsini <sylphrenadin@gmail.com>
---
Changes in v2:
Add another of_node_put() in for_each_child_of_node() as
pointed out by Andrew.
Changes in v3:
- Correct syntax errors
- Modify commit message
Changes in v4:
- Change commit prefix to include the driver name,
mt7530, as pointed out by Vladimir.
- Change the signoff to the correct format.
---
drivers/net/dsa/mt7530.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/drivers/net/dsa/mt7530.c b/drivers/net/dsa/mt7530.c
index 8dcb8a49ab67..4b4701c69fe1 100644
--- a/drivers/net/dsa/mt7530.c
+++ b/drivers/net/dsa/mt7530.c
@@ -1326,14 +1326,17 @@ mt7530_setup(struct dsa_switch *ds)
if (phy_node->parent == priv->dev->of_node->parent) {
ret = of_get_phy_mode(mac_np, &interface);
- if (ret && ret != -ENODEV)
+ if (ret && ret != -ENODEV) {
+ of_node_put(mac_np);
return ret;
+ }
id = of_mdio_parse_addr(ds->dev, phy_node);
if (id == 0)
priv->p5_intf_sel = P5_INTF_SEL_PHY_P0;
if (id == 4)
priv->p5_intf_sel = P5_INTF_SEL_PHY_P4;
}
+ of_node_put(mac_np);
of_node_put(phy_node);
break;
}
--
2.17.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH V4] net: dsa: mt7530: Add of_node_put() before break and return statements
@ 2020-08-24 20:03 ` Sumera Priyadarsini
0 siblings, 0 replies; 6+ messages in thread
From: Sumera Priyadarsini @ 2020-08-24 20:03 UTC (permalink / raw)
To: davem
Cc: andrew, f.fainelli, netdev, sean.wang, linux-kernel,
Julia.Lawall, linux-mediatek, matthias.bgg, kuba, vivien.didelot,
linux-arm-kernel
Every iteration of for_each_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 mt7530.c by inserting of_node_put()
before the break and return statements.
Issue found with Coccinelle.
Signed-off-by: Sumera Priyadarsini <sylphrenadin@gmail.com>
---
Changes in v2:
Add another of_node_put() in for_each_child_of_node() as
pointed out by Andrew.
Changes in v3:
- Correct syntax errors
- Modify commit message
Changes in v4:
- Change commit prefix to include the driver name,
mt7530, as pointed out by Vladimir.
- Change the signoff to the correct format.
---
drivers/net/dsa/mt7530.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/drivers/net/dsa/mt7530.c b/drivers/net/dsa/mt7530.c
index 8dcb8a49ab67..4b4701c69fe1 100644
--- a/drivers/net/dsa/mt7530.c
+++ b/drivers/net/dsa/mt7530.c
@@ -1326,14 +1326,17 @@ mt7530_setup(struct dsa_switch *ds)
if (phy_node->parent == priv->dev->of_node->parent) {
ret = of_get_phy_mode(mac_np, &interface);
- if (ret && ret != -ENODEV)
+ if (ret && ret != -ENODEV) {
+ of_node_put(mac_np);
return ret;
+ }
id = of_mdio_parse_addr(ds->dev, phy_node);
if (id == 0)
priv->p5_intf_sel = P5_INTF_SEL_PHY_P0;
if (id == 4)
priv->p5_intf_sel = P5_INTF_SEL_PHY_P4;
}
+ of_node_put(mac_np);
of_node_put(phy_node);
break;
}
--
2.17.1
_______________________________________________
Linux-mediatek mailing list
Linux-mediatek@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-mediatek
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH V4] net: dsa: mt7530: Add of_node_put() before break and return statements
@ 2020-08-24 20:03 ` Sumera Priyadarsini
0 siblings, 0 replies; 6+ messages in thread
From: Sumera Priyadarsini @ 2020-08-24 20:03 UTC (permalink / raw)
To: davem
Cc: andrew, f.fainelli, netdev, sean.wang, linux-kernel,
Julia.Lawall, linux-mediatek, matthias.bgg, kuba, vivien.didelot,
linux-arm-kernel
Every iteration of for_each_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 mt7530.c by inserting of_node_put()
before the break and return statements.
Issue found with Coccinelle.
Signed-off-by: Sumera Priyadarsini <sylphrenadin@gmail.com>
---
Changes in v2:
Add another of_node_put() in for_each_child_of_node() as
pointed out by Andrew.
Changes in v3:
- Correct syntax errors
- Modify commit message
Changes in v4:
- Change commit prefix to include the driver name,
mt7530, as pointed out by Vladimir.
- Change the signoff to the correct format.
---
drivers/net/dsa/mt7530.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/drivers/net/dsa/mt7530.c b/drivers/net/dsa/mt7530.c
index 8dcb8a49ab67..4b4701c69fe1 100644
--- a/drivers/net/dsa/mt7530.c
+++ b/drivers/net/dsa/mt7530.c
@@ -1326,14 +1326,17 @@ mt7530_setup(struct dsa_switch *ds)
if (phy_node->parent == priv->dev->of_node->parent) {
ret = of_get_phy_mode(mac_np, &interface);
- if (ret && ret != -ENODEV)
+ if (ret && ret != -ENODEV) {
+ of_node_put(mac_np);
return ret;
+ }
id = of_mdio_parse_addr(ds->dev, phy_node);
if (id == 0)
priv->p5_intf_sel = P5_INTF_SEL_PHY_P0;
if (id == 4)
priv->p5_intf_sel = P5_INTF_SEL_PHY_P4;
}
+ of_node_put(mac_np);
of_node_put(phy_node);
break;
}
--
2.17.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH V4] net: dsa: mt7530: Add of_node_put() before break and return statements
2020-08-24 20:03 ` Sumera Priyadarsini
(?)
@ 2020-08-25 14:48 ` David Miller
-1 siblings, 0 replies; 6+ messages in thread
From: David Miller @ 2020-08-25 14:48 UTC (permalink / raw)
To: sylphrenadin
Cc: Julia.Lawall, andrew, sean.wang, vivien.didelot, f.fainelli,
kuba, matthias.bgg, netdev, linux-arm-kernel, linux-mediatek,
linux-kernel
From: Sumera Priyadarsini <sylphrenadin@gmail.com>
Date: Tue, 25 Aug 2020 01:33:11 +0530
> Every iteration of for_each_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 mt7530.c by inserting of_node_put()
> before the break and return statements.
>
> Issue found with Coccinelle.
>
> Signed-off-by: Sumera Priyadarsini <sylphrenadin@gmail.com>
Applied, thank you.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH V4] net: dsa: mt7530: Add of_node_put() before break and return statements
@ 2020-08-25 14:48 ` David Miller
0 siblings, 0 replies; 6+ messages in thread
From: David Miller @ 2020-08-25 14:48 UTC (permalink / raw)
To: sylphrenadin
Cc: andrew, f.fainelli, netdev, sean.wang, linux-kernel,
Julia.Lawall, linux-mediatek, matthias.bgg, kuba, vivien.didelot,
linux-arm-kernel
From: Sumera Priyadarsini <sylphrenadin@gmail.com>
Date: Tue, 25 Aug 2020 01:33:11 +0530
> Every iteration of for_each_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 mt7530.c by inserting of_node_put()
> before the break and return statements.
>
> Issue found with Coccinelle.
>
> Signed-off-by: Sumera Priyadarsini <sylphrenadin@gmail.com>
Applied, thank you.
_______________________________________________
Linux-mediatek mailing list
Linux-mediatek@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-mediatek
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH V4] net: dsa: mt7530: Add of_node_put() before break and return statements
@ 2020-08-25 14:48 ` David Miller
0 siblings, 0 replies; 6+ messages in thread
From: David Miller @ 2020-08-25 14:48 UTC (permalink / raw)
To: sylphrenadin
Cc: andrew, f.fainelli, netdev, sean.wang, linux-kernel,
Julia.Lawall, linux-mediatek, matthias.bgg, kuba, vivien.didelot,
linux-arm-kernel
From: Sumera Priyadarsini <sylphrenadin@gmail.com>
Date: Tue, 25 Aug 2020 01:33:11 +0530
> Every iteration of for_each_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 mt7530.c by inserting of_node_put()
> before the break and return statements.
>
> Issue found with Coccinelle.
>
> Signed-off-by: Sumera Priyadarsini <sylphrenadin@gmail.com>
Applied, thank you.
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2020-08-25 14:50 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-08-24 20:03 [PATCH V4] net: dsa: mt7530: Add of_node_put() before break and return statements Sumera Priyadarsini
2020-08-24 20:03 ` Sumera Priyadarsini
2020-08-24 20:03 ` Sumera Priyadarsini
2020-08-25 14:48 ` David Miller
2020-08-25 14:48 ` David Miller
2020-08-25 14:48 ` David Miller
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.