* [net: PATCH] net: dsa: add missing refcount decrementation
@ 2022-04-25 9:47 Marcin Wojtas
2022-04-27 17:25 ` Vladimir Oltean
0 siblings, 1 reply; 3+ messages in thread
From: Marcin Wojtas @ 2022-04-25 9:47 UTC (permalink / raw)
To: linux-kernel, netdev
Cc: davem, kuba, andrew, vivien.didelot, f.fainelli, olteanv,
upstream, Marcin Wojtas
After obtaining the "phy-handle" node, decrementing
refcount is required. Fix that.
Fixes: a20f997010c4 ("net: dsa: Don't instantiate phylink for CPU/DSA ports unless needed")
Signed-off-by: Marcin Wojtas <mw@semihalf.com>
---
net/dsa/port.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/net/dsa/port.c b/net/dsa/port.c
index 32d472a82241..cdc56ba11f52 100644
--- a/net/dsa/port.c
+++ b/net/dsa/port.c
@@ -1620,8 +1620,10 @@ int dsa_port_link_register_of(struct dsa_port *dp)
if (ds->ops->phylink_mac_link_down)
ds->ops->phylink_mac_link_down(ds, port,
MLO_AN_FIXED, PHY_INTERFACE_MODE_NA);
+ of_node_put(phy_np);
return dsa_port_phylink_register(dp);
}
+ of_node_put(phy_np);
return 0;
}
--
2.29.0
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [net: PATCH] net: dsa: add missing refcount decrementation
2022-04-25 9:47 [net: PATCH] net: dsa: add missing refcount decrementation Marcin Wojtas
@ 2022-04-27 17:25 ` Vladimir Oltean
2022-04-27 17:38 ` Marcin Wojtas
0 siblings, 1 reply; 3+ messages in thread
From: Vladimir Oltean @ 2022-04-27 17:25 UTC (permalink / raw)
To: Marcin Wojtas
Cc: linux-kernel, netdev, davem, kuba, andrew, vivien.didelot,
f.fainelli, upstream
On Mon, Apr 25, 2022 at 11:47:08AM +0200, Marcin Wojtas wrote:
> After obtaining the "phy-handle" node, decrementing
> refcount is required. Fix that.
>
> Fixes: a20f997010c4 ("net: dsa: Don't instantiate phylink for CPU/DSA ports unless needed")
> Signed-off-by: Marcin Wojtas <mw@semihalf.com>
> ---
> net/dsa/port.c | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/net/dsa/port.c b/net/dsa/port.c
> index 32d472a82241..cdc56ba11f52 100644
> --- a/net/dsa/port.c
> +++ b/net/dsa/port.c
> @@ -1620,8 +1620,10 @@ int dsa_port_link_register_of(struct dsa_port *dp)
> if (ds->ops->phylink_mac_link_down)
> ds->ops->phylink_mac_link_down(ds, port,
> MLO_AN_FIXED, PHY_INTERFACE_MODE_NA);
> + of_node_put(phy_np);
> return dsa_port_phylink_register(dp);
> }
> + of_node_put(phy_np);
> return 0;
> }
>
> --
> 2.29.0
>
Thanks for the patch.
commit fc06b2867f4cea543505acfb194c2be4ebf0c7d3
Author: Miaoqian Lin <linmq006@gmail.com>
Date: Wed Apr 20 19:04:08 2022 +0800
net: dsa: Add missing of_node_put() in dsa_port_link_register_of
The device_node pointer is returned by of_parse_phandle() with refcount
incremented. We should use of_node_put() on it when done.
of_node_put() will check for NULL value.
Fixes: a20f997010c4 ("net: dsa: Don't instantiate phylink for CPU/DSA ports unless needed")
Signed-off-by: Miaoqian Lin <linmq006@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [net: PATCH] net: dsa: add missing refcount decrementation
2022-04-27 17:25 ` Vladimir Oltean
@ 2022-04-27 17:38 ` Marcin Wojtas
0 siblings, 0 replies; 3+ messages in thread
From: Marcin Wojtas @ 2022-04-27 17:38 UTC (permalink / raw)
To: Vladimir Oltean
Cc: Linux Kernel Mailing List, netdev, David S. Miller,
Jakub Kicinski, Andrew Lunn, vivien.didelot, Florian Fainelli,
upstream
śr., 27 kwi 2022 o 19:25 Vladimir Oltean <olteanv@gmail.com> napisał(a):
>
> On Mon, Apr 25, 2022 at 11:47:08AM +0200, Marcin Wojtas wrote:
> > After obtaining the "phy-handle" node, decrementing
> > refcount is required. Fix that.
> >
> > Fixes: a20f997010c4 ("net: dsa: Don't instantiate phylink for CPU/DSA ports unless needed")
> > Signed-off-by: Marcin Wojtas <mw@semihalf.com>
> > ---
> > net/dsa/port.c | 2 ++
> > 1 file changed, 2 insertions(+)
> >
> > diff --git a/net/dsa/port.c b/net/dsa/port.c
> > index 32d472a82241..cdc56ba11f52 100644
> > --- a/net/dsa/port.c
> > +++ b/net/dsa/port.c
> > @@ -1620,8 +1620,10 @@ int dsa_port_link_register_of(struct dsa_port *dp)
> > if (ds->ops->phylink_mac_link_down)
> > ds->ops->phylink_mac_link_down(ds, port,
> > MLO_AN_FIXED, PHY_INTERFACE_MODE_NA);
> > + of_node_put(phy_np);
> > return dsa_port_phylink_register(dp);
> > }
> > + of_node_put(phy_np);
> > return 0;
> > }
> >
> > --
> > 2.29.0
> >
>
> Thanks for the patch.
>
> commit fc06b2867f4cea543505acfb194c2be4ebf0c7d3
> Author: Miaoqian Lin <linmq006@gmail.com>
> Date: Wed Apr 20 19:04:08 2022 +0800
>
> net: dsa: Add missing of_node_put() in dsa_port_link_register_of
>
> The device_node pointer is returned by of_parse_phandle() with refcount
> incremented. We should use of_node_put() on it when done.
> of_node_put() will check for NULL value.
>
> Fixes: a20f997010c4 ("net: dsa: Don't instantiate phylink for CPU/DSA ports unless needed")
> Signed-off-by: Miaoqian Lin <linmq006@gmail.com>
> Signed-off-by: David S. Miller <davem@davemloft.net>
Great, I'll rebase then and I can drop my patch.
Thanks,
Marcin
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-04-27 17:38 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-04-25 9:47 [net: PATCH] net: dsa: add missing refcount decrementation Marcin Wojtas
2022-04-27 17:25 ` Vladimir Oltean
2022-04-27 17:38 ` Marcin Wojtas
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).