* [PATCH] net: dsa: Fix an error handling path in 'dsa_switch_parse_ports_of()'
@ 2021-10-18 19:59 Christophe JAILLET
2021-10-20 0:00 ` patchwork-bot+netdevbpf
0 siblings, 1 reply; 2+ messages in thread
From: Christophe JAILLET @ 2021-10-18 19:59 UTC (permalink / raw)
To: andrew, vivien.didelot, f.fainelli, olteanv, davem, kuba
Cc: netdev, linux-kernel, kernel-janitors, Christophe JAILLET
If we return before the end of the 'for_each_child_of_node()' iterator, the
reference taken on 'port' must be released.
Add the missing 'of_node_put()' calls.
Fixes: 83c0afaec7b7 ("net: dsa: Add new binding implementation")
Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
---
net/dsa/dsa2.c | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/net/dsa/dsa2.c b/net/dsa/dsa2.c
index 691d27498b24..6ffd2928d2a6 100644
--- a/net/dsa/dsa2.c
+++ b/net/dsa/dsa2.c
@@ -1367,12 +1367,15 @@ static int dsa_switch_parse_ports_of(struct dsa_switch *ds,
for_each_available_child_of_node(ports, port) {
err = of_property_read_u32(port, "reg", ®);
- if (err)
+ if (err) {
+ of_node_put(port);
goto out_put_node;
+ }
if (reg >= ds->num_ports) {
dev_err(ds->dev, "port %pOF index %u exceeds num_ports (%zu)\n",
port, reg, ds->num_ports);
+ of_node_put(port);
err = -EINVAL;
goto out_put_node;
}
@@ -1380,8 +1383,10 @@ static int dsa_switch_parse_ports_of(struct dsa_switch *ds,
dp = dsa_to_port(ds, reg);
err = dsa_port_parse_of(dp, port);
- if (err)
+ if (err) {
+ of_node_put(port);
goto out_put_node;
+ }
}
out_put_node:
--
2.30.2
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] net: dsa: Fix an error handling path in 'dsa_switch_parse_ports_of()'
2021-10-18 19:59 [PATCH] net: dsa: Fix an error handling path in 'dsa_switch_parse_ports_of()' Christophe JAILLET
@ 2021-10-20 0:00 ` patchwork-bot+netdevbpf
0 siblings, 0 replies; 2+ messages in thread
From: patchwork-bot+netdevbpf @ 2021-10-20 0:00 UTC (permalink / raw)
To: Christophe JAILLET
Cc: andrew, vivien.didelot, f.fainelli, olteanv, davem, kuba, netdev,
linux-kernel, kernel-janitors
Hello:
This patch was applied to netdev/net.git (master)
by Jakub Kicinski <kuba@kernel.org>:
On Mon, 18 Oct 2021 21:59:00 +0200 you wrote:
> If we return before the end of the 'for_each_child_of_node()' iterator, the
> reference taken on 'port' must be released.
>
> Add the missing 'of_node_put()' calls.
>
> Fixes: 83c0afaec7b7 ("net: dsa: Add new binding implementation")
> Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
>
> [...]
Here is the summary with links:
- net: dsa: Fix an error handling path in 'dsa_switch_parse_ports_of()'
https://git.kernel.org/netdev/net/c/ba69fd9101f2
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-10-20 0:00 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-10-18 19:59 [PATCH] net: dsa: Fix an error handling path in 'dsa_switch_parse_ports_of()' Christophe JAILLET
2021-10-20 0:00 ` patchwork-bot+netdevbpf
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).