* [PATCH net 1/2] net: macb: destroy the phylink instance on the probe error path
2026-09-07 21:08 [PATCH net 0/2] net: macb: fix two probe path leaks Nicolai Buchwitz
@ 2026-09-07 21:08 ` Nicolai Buchwitz
2026-09-07 21:08 ` [PATCH net 2/2] net: macb: put the "mdio" child node reference on success Nicolai Buchwitz
2026-09-09 1:40 ` [PATCH net 0/2] net: macb: fix two probe path leaks patchwork-bot+netdevbpf
2 siblings, 0 replies; 4+ messages in thread
From: Nicolai Buchwitz @ 2026-09-07 21:08 UTC (permalink / raw)
To: netdev
Cc: andrew+netdev, davem, edumazet, kuba, pabeni, linux, theo.lebrun,
conor.dooley, atenart, o.rempel, linux-kernel, Nicolai Buchwitz
macb_mii_init() creates a phylink instance on both of its success paths,
but the probe unwind frees the netdev without destroying it, so a failing
macb_alloc_tieoff() or register_netdev() leaks the instance.
Destroy it at err_out_unregister_mdio, which is only reachable once
macb_mii_init() has succeeded, so bp->phylink is valid there.
Fixes: 7897b071ac3b ("net: macb: convert to phylink")
Signed-off-by: Nicolai Buchwitz <nb@tipi-net.de>
---
drivers/net/ethernet/cadence/macb_main.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/net/ethernet/cadence/macb_main.c b/drivers/net/ethernet/cadence/macb_main.c
index 8469df0d89c3..bba7246e1dbd 100644
--- a/drivers/net/ethernet/cadence/macb_main.c
+++ b/drivers/net/ethernet/cadence/macb_main.c
@@ -5980,6 +5980,7 @@ static int macb_probe(struct platform_device *pdev)
mdiobus_unregister(bp->mii_bus);
mdiobus_free(bp->mii_bus);
}
+ phylink_destroy(bp->phylink);
err_out_phy_exit:
phy_exit(bp->phy);
--
2.53.0
^ permalink raw reply [flat|nested] 4+ messages in thread* [PATCH net 2/2] net: macb: put the "mdio" child node reference on success
2026-09-07 21:08 [PATCH net 0/2] net: macb: fix two probe path leaks Nicolai Buchwitz
2026-09-07 21:08 ` [PATCH net 1/2] net: macb: destroy the phylink instance on the probe error path Nicolai Buchwitz
@ 2026-09-07 21:08 ` Nicolai Buchwitz
2026-09-09 1:40 ` [PATCH net 0/2] net: macb: fix two probe path leaks patchwork-bot+netdevbpf
2 siblings, 0 replies; 4+ messages in thread
From: Nicolai Buchwitz @ 2026-09-07 21:08 UTC (permalink / raw)
To: netdev
Cc: andrew+netdev, davem, edumazet, kuba, pabeni, linux, theo.lebrun,
conor.dooley, atenart, o.rempel, linux-kernel, Nicolai Buchwitz
macb_mii_init() holds the reference returned by of_get_child_by_name()
for macb_mdiobus_register() and drops it only on the error paths, so
every successful probe leaks a node reference. On a CM5, overlay
removal after four bind cycles reports
OF: ERROR: memory leak, expected refcount 1 instead of 5
Drop the reference after registration, where __mdiobus_register() has
already taken its own for the lifetime of the bus.
Fixes: 8a6631f1cece ("net: macb: avoid redundant lookup for "mdio" child node in MDIO setup")
Signed-off-by: Nicolai Buchwitz <nb@tipi-net.de>
---
drivers/net/ethernet/cadence/macb_main.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/drivers/net/ethernet/cadence/macb_main.c b/drivers/net/ethernet/cadence/macb_main.c
index bba7246e1dbd..b1dc5840d756 100644
--- a/drivers/net/ethernet/cadence/macb_main.c
+++ b/drivers/net/ethernet/cadence/macb_main.c
@@ -1164,6 +1164,8 @@ static int macb_mii_init(struct macb *bp)
if (err)
goto err_out_unregister_bus;
+ of_node_put(mdio_np);
+
return 0;
err_out_unregister_bus:
--
2.53.0
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH net 0/2] net: macb: fix two probe path leaks
2026-09-07 21:08 [PATCH net 0/2] net: macb: fix two probe path leaks Nicolai Buchwitz
2026-09-07 21:08 ` [PATCH net 1/2] net: macb: destroy the phylink instance on the probe error path Nicolai Buchwitz
2026-09-07 21:08 ` [PATCH net 2/2] net: macb: put the "mdio" child node reference on success Nicolai Buchwitz
@ 2026-09-09 1:40 ` patchwork-bot+netdevbpf
2 siblings, 0 replies; 4+ messages in thread
From: patchwork-bot+netdevbpf @ 2026-09-09 1:40 UTC (permalink / raw)
To: Nicolai Buchwitz
Cc: netdev, andrew+netdev, davem, edumazet, kuba, pabeni, linux,
theo.lebrun, conor.dooley, atenart, o.rempel, linux-kernel
Hello:
This series was applied to netdev/net.git (main)
by Jakub Kicinski <kuba@kernel.org>:
On Mon, 7 Sep 2026 23:08:54 +0200 you wrote:
> Two independent leaks on macb probe paths, both noticed while reviewing
> the fixed-link unbind crash fix [1].
>
> Patch 1 destroys the phylink instance when probe fails after
> macb_mii_init() has succeeded. Patch 2 drops the "mdio" child node
> reference on the success path of macb_mii_init().
>
> [...]
Here is the summary with links:
- [net,1/2] net: macb: destroy the phylink instance on the probe error path
https://git.kernel.org/netdev/net/c/7d059f390750
- [net,2/2] net: macb: put the "mdio" child node reference on success
https://git.kernel.org/netdev/net/c/382a373d9ea7
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] 4+ messages in thread