2023-01-31 10:01:01

by Clément Léger

Subject: [PATCH net] net: phylink: move phy_device_free() to correctly release phy device

After calling fwnode_phy_find_device(), the phy device refcount is
incremented. Then, when the phy device is attached to a netdev with
phy_attach_direct(), the refcount is also incremented but only
decremented in the caller if phy_attach_direct() fails. Move
phy_device_free() before the "if" to always release it correctly.
Indeed, either phy_attach_direct() failed and we don't want to keep a
reference to the phydev or it succeeded and a reference has been taken
internally.

Fixes: 25396f680dd6 ("net: phylink: introduce phylink_fwnode_phy_connect()")
Signed-off-by: Clément Léger <[email protected]>
---
drivers/net/phy/phylink.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/net/phy/phylink.c b/drivers/net/phy/phylink.c
index 09cc65c0da93..4d2519cdb801 100644
--- a/drivers/net/phy/phylink.c
+++ b/drivers/net/phy/phylink.c
@@ -1812,10 +1812,9 @@ int phylink_fwnode_phy_connect(struct phylink *pl,

ret = phy_attach_direct(pl->netdev, phy_dev, flags,
pl->link_interface);
- if (ret) {
- phy_device_free(phy_dev);
+ phy_device_free(phy_dev);
+ if (ret)
return ret;
- }

ret = phylink_bringup_phy(pl, phy_dev, pl->link_config.interface);
if (ret)
--
2.39.0

2023-02-03 10:00:30

by patchwork-bot+netdevbpf

Subject: Re: [PATCH net] net: phylink: move phy_device_free() to correctly release phy device

Hello:

This patch was applied to netdev/net.git (master)
by David S. Miller <[email protected]>:

On Tue, 31 Jan 2023 11:02:42 +0100 you wrote:
> After calling fwnode_phy_find_device(), the phy device refcount is
> incremented. Then, when the phy device is attached to a netdev with
> phy_attach_direct(), the refcount is also incremented but only
> decremented in the caller if phy_attach_direct() fails. Move
> phy_device_free() before the "if" to always release it correctly.
> Indeed, either phy_attach_direct() failed and we don't want to keep a
> reference to the phydev or it succeeded and a reference has been taken
> internally.
>
> [...]

Here is the summary with links:
- [net] net: phylink: move phy_device_free() to correctly release phy device
https://git.kernel.org/netdev/net/c/ce93fdb5f2ca

You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html