* [PATCH] net: dsa: microchip: ksz_common: Fix refcount leak bug
@ 2022-07-13 11:54 Liang He
2022-07-14 14:59 ` Vladimir Oltean
0 siblings, 1 reply; 3+ messages in thread
From: Liang He @ 2022-07-13 11:54 UTC (permalink / raw)
To: woojung.huh, UNGLinuxDriver, andrew, vivien.didelot, f.fainelli,
olteanv, windhl, netdev
In ksz_switch_register(), we should call of_node_put() for the
reference returned by of_get_child_by_name() which has increased
the refcount.
Fixes: 44e53c88828f ("net: dsa: microchip: support for "ethernet-ports" node")
Signed-off-by: Liang He <windhl@126.com>
---
drivers/net/dsa/microchip/ksz_common.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/drivers/net/dsa/microchip/ksz_common.c b/drivers/net/dsa/microchip/ksz_common.c
index 9ca8c8d7740f..92a500e1ccd2 100644
--- a/drivers/net/dsa/microchip/ksz_common.c
+++ b/drivers/net/dsa/microchip/ksz_common.c
@@ -1038,18 +1038,21 @@ int ksz_switch_register(struct ksz_device *dev,
ports = of_get_child_by_name(dev->dev->of_node, "ethernet-ports");
if (!ports)
ports = of_get_child_by_name(dev->dev->of_node, "ports");
- if (ports)
+ if (ports) {
for_each_available_child_of_node(ports, port) {
if (of_property_read_u32(port, "reg",
&port_num))
continue;
if (!(dev->port_mask & BIT(port_num))) {
of_node_put(port);
+ of_node_put(ports);
return -EINVAL;
}
of_get_phy_mode(port,
&dev->ports[port_num].interface);
}
+ of_node_put(ports);
+ }
dev->synclko_125 = of_property_read_bool(dev->dev->of_node,
"microchip,synclko-125");
dev->synclko_disable = of_property_read_bool(dev->dev->of_node,
--
2.25.1
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] net: dsa: microchip: ksz_common: Fix refcount leak bug
2022-07-13 11:54 [PATCH] net: dsa: microchip: ksz_common: Fix refcount leak bug Liang He
@ 2022-07-14 14:59 ` Vladimir Oltean
2022-07-14 15:18 ` Liang He
0 siblings, 1 reply; 3+ messages in thread
From: Vladimir Oltean @ 2022-07-14 14:59 UTC (permalink / raw)
To: Liang He
Cc: woojung.huh, UNGLinuxDriver, andrew, vivien.didelot, f.fainelli,
netdev
On Wed, Jul 13, 2022 at 07:54:28PM +0800, Liang He wrote:
> In ksz_switch_register(), we should call of_node_put() for the
> reference returned by of_get_child_by_name() which has increased
> the refcount.
>
> Fixes: 44e53c88828f ("net: dsa: microchip: support for "ethernet-ports" node")
I disagree with the git blame resolution, it should be:
Fixes: 912aae27c6af ("net: dsa: microchip: really look for phy-mode in port nodes")
Please resend with that line changed.
> Signed-off-by: Liang He <windhl@126.com>
> ---
>
> drivers/net/dsa/microchip/ksz_common.c | 5 ++++-
> 1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/net/dsa/microchip/ksz_common.c b/drivers/net/dsa/microchip/ksz_common.c
> index 9ca8c8d7740f..92a500e1ccd2 100644
> --- a/drivers/net/dsa/microchip/ksz_common.c
> +++ b/drivers/net/dsa/microchip/ksz_common.c
> @@ -1038,18 +1038,21 @@ int ksz_switch_register(struct ksz_device *dev,
> ports = of_get_child_by_name(dev->dev->of_node, "ethernet-ports");
> if (!ports)
> ports = of_get_child_by_name(dev->dev->of_node, "ports");
> - if (ports)
> + if (ports) {
> for_each_available_child_of_node(ports, port) {
> if (of_property_read_u32(port, "reg",
> &port_num))
> continue;
> if (!(dev->port_mask & BIT(port_num))) {
> of_node_put(port);
> + of_node_put(ports);
> return -EINVAL;
> }
> of_get_phy_mode(port,
> &dev->ports[port_num].interface);
> }
> + of_node_put(ports);
> + }
> dev->synclko_125 = of_property_read_bool(dev->dev->of_node,
> "microchip,synclko-125");
> dev->synclko_disable = of_property_read_bool(dev->dev->of_node,
> --
> 2.25.1
>
^ permalink raw reply [flat|nested] 3+ messages in thread* Re:Re: [PATCH] net: dsa: microchip: ksz_common: Fix refcount leak bug
2022-07-14 14:59 ` Vladimir Oltean
@ 2022-07-14 15:18 ` Liang He
0 siblings, 0 replies; 3+ messages in thread
From: Liang He @ 2022-07-14 15:18 UTC (permalink / raw)
To: Vladimir Oltean
Cc: woojung.huh, UNGLinuxDriver, andrew, vivien.didelot, f.fainelli,
netdev
At 2022-07-14 22:59:56, "Vladimir Oltean" <olteanv@gmail.com> wrote:
>On Wed, Jul 13, 2022 at 07:54:28PM +0800, Liang He wrote:
>> In ksz_switch_register(), we should call of_node_put() for the
>> reference returned by of_get_child_by_name() which has increased
>> the refcount.
>>
>> Fixes: 44e53c88828f ("net: dsa: microchip: support for "ethernet-ports" node")
>
>I disagree with the git blame resolution, it should be:
>
>Fixes: 912aae27c6af ("net: dsa: microchip: really look for phy-mode in port nodes")
>
>Please resend with that line changed.
>
Thanks,
I will resend with correct fix tag soon!
Liang
>> Signed-off-by: Liang He <windhl@126.com>
>> ---
>>
>> drivers/net/dsa/microchip/ksz_common.c | 5 ++++-
>> 1 file changed, 4 insertions(+), 1 deletion(-)
>>
>> diff --git a/drivers/net/dsa/microchip/ksz_common.c b/drivers/net/dsa/microchip/ksz_common.c
>> index 9ca8c8d7740f..92a500e1ccd2 100644
>> --- a/drivers/net/dsa/microchip/ksz_common.c
>> +++ b/drivers/net/dsa/microchip/ksz_common.c
>> @@ -1038,18 +1038,21 @@ int ksz_switch_register(struct ksz_device *dev,
>> ports = of_get_child_by_name(dev->dev->of_node, "ethernet-ports");
>> if (!ports)
>> ports = of_get_child_by_name(dev->dev->of_node, "ports");
>> - if (ports)
>> + if (ports) {
>> for_each_available_child_of_node(ports, port) {
>> if (of_property_read_u32(port, "reg",
>> &port_num))
>> continue;
>> if (!(dev->port_mask & BIT(port_num))) {
>> of_node_put(port);
>> + of_node_put(ports);
>> return -EINVAL;
>> }
>> of_get_phy_mode(port,
>> &dev->ports[port_num].interface);
>> }
>> + of_node_put(ports);
>> + }
>> dev->synclko_125 = of_property_read_bool(dev->dev->of_node,
>> "microchip,synclko-125");
>> dev->synclko_disable = of_property_read_bool(dev->dev->of_node,
>> --
>> 2.25.1
>>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-07-14 15:19 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-07-13 11:54 [PATCH] net: dsa: microchip: ksz_common: Fix refcount leak bug Liang He
2022-07-14 14:59 ` Vladimir Oltean
2022-07-14 15:18 ` Liang He
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).