* [PATCH net v3] net: mdiobus: fix double put fwnode in the error path
@ 2022-12-02 5:18 Yang Yingliang
2022-12-03 2:14 ` Zeng Heng
2022-12-05 11:10 ` patchwork-bot+netdevbpf
0 siblings, 2 replies; 3+ messages in thread
From: Yang Yingliang @ 2022-12-02 5:18 UTC (permalink / raw)
To: netdev
Cc: andrew, hkallweit1, linux, davem, edumazet, kuba, pabeni,
ioana.ciornei, calvin.johnson, grant.likely, zengheng4
If phy_device_register() or fwnode_mdiobus_phy_device_register()
fail, phy_device_free() is called, the device refcount is decreased
to 0, then fwnode_handle_put() will be called in phy_device_release(),
but in the error path, fwnode_handle_put() has already been called,
so set fwnode to NULL after fwnode_handle_put() in the error path to
avoid double put.
Fixes: cdde1560118f ("net: mdiobus: fix unbalanced node reference count")
Reported-by: Zeng Heng <zengheng4@huawei.com>
Tested-by: Zeng Heng <zengheng4@huawei.com>
Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
---
v2 -> v3:
set fwnode to NULL before calling fwnode_handle_put()
v1 -> v2:
Don't remove fwnode_handle_put() in the error path,
set fwnode to NULL avoid double put.
---
drivers/net/mdio/fwnode_mdio.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/net/mdio/fwnode_mdio.c b/drivers/net/mdio/fwnode_mdio.c
index eb344f6d4a7b..b782c35c4ac1 100644
--- a/drivers/net/mdio/fwnode_mdio.c
+++ b/drivers/net/mdio/fwnode_mdio.c
@@ -98,6 +98,7 @@ int fwnode_mdiobus_phy_device_register(struct mii_bus *mdio,
*/
rc = phy_device_register(phy);
if (rc) {
+ device_set_node(&phy->mdio.dev, NULL);
fwnode_handle_put(child);
return rc;
}
@@ -153,7 +154,8 @@ int fwnode_mdiobus_register_phy(struct mii_bus *bus,
/* All data is now stored in the phy struct, so register it */
rc = phy_device_register(phy);
if (rc) {
- fwnode_handle_put(phy->mdio.dev.fwnode);
+ phy->mdio.dev.fwnode = NULL;
+ fwnode_handle_put(child);
goto clean_phy;
}
} else if (is_of_node(child)) {
--
2.25.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH net v3] net: mdiobus: fix double put fwnode in the error path
2022-12-02 5:18 [PATCH net v3] net: mdiobus: fix double put fwnode in the error path Yang Yingliang
@ 2022-12-03 2:14 ` Zeng Heng
2022-12-05 11:10 ` patchwork-bot+netdevbpf
1 sibling, 0 replies; 3+ messages in thread
From: Zeng Heng @ 2022-12-03 2:14 UTC (permalink / raw)
To: Yang Yingliang, netdev
Cc: andrew, hkallweit1, linux, davem, edumazet, kuba, pabeni,
ioana.ciornei, calvin.johnson, grant.likely
On 2022/12/2 13:18, Yang Yingliang wrote:
> If phy_device_register() or fwnode_mdiobus_phy_device_register()
> fail, phy_device_free() is called, the device refcount is decreased
> to 0, then fwnode_handle_put() will be called in phy_device_release(),
> but in the error path, fwnode_handle_put() has already been called,
> so set fwnode to NULL after fwnode_handle_put() in the error path to
> avoid double put.
>
> Fixes: cdde1560118f ("net: mdiobus: fix unbalanced node reference count")
> Reported-by: Zeng Heng <zengheng4@huawei.com>
> Tested-by: Zeng Heng <zengheng4@huawei.com>
> Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
> ---
> v2 -> v3:
> set fwnode to NULL before calling fwnode_handle_put()
>
> v1 -> v2:
> Don't remove fwnode_handle_put() in the error path,
> set fwnode to NULL avoid double put.
> ---
> drivers/net/mdio/fwnode_mdio.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/net/mdio/fwnode_mdio.c b/drivers/net/mdio/fwnode_mdio.c
> index eb344f6d4a7b..b782c35c4ac1 100644
> --- a/drivers/net/mdio/fwnode_mdio.c
> +++ b/drivers/net/mdio/fwnode_mdio.c
> @@ -98,6 +98,7 @@ int fwnode_mdiobus_phy_device_register(struct mii_bus *mdio,
> */
> rc = phy_device_register(phy);
> if (rc) {
> + device_set_node(&phy->mdio.dev, NULL);
> fwnode_handle_put(child);
> return rc;
> }
> @@ -153,7 +154,8 @@ int fwnode_mdiobus_register_phy(struct mii_bus *bus,
> /* All data is now stored in the phy struct, so register it */
> rc = phy_device_register(phy);
> if (rc) {
> - fwnode_handle_put(phy->mdio.dev.fwnode);
> + phy->mdio.dev.fwnode = NULL;
> + fwnode_handle_put(child);
> goto clean_phy;
> }
> } else if (is_of_node(child)) {
Reviewed-by: Zeng Heng <zengheng4@huawei.com>
Tested-by: Zeng Heng <zengheng4@huawei.com>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH net v3] net: mdiobus: fix double put fwnode in the error path
2022-12-02 5:18 [PATCH net v3] net: mdiobus: fix double put fwnode in the error path Yang Yingliang
2022-12-03 2:14 ` Zeng Heng
@ 2022-12-05 11:10 ` patchwork-bot+netdevbpf
1 sibling, 0 replies; 3+ messages in thread
From: patchwork-bot+netdevbpf @ 2022-12-05 11:10 UTC (permalink / raw)
To: Yang Yingliang
Cc: netdev, andrew, hkallweit1, linux, davem, edumazet, kuba, pabeni,
ioana.ciornei, calvin.johnson, grant.likely, zengheng4
Hello:
This patch was applied to netdev/net.git (master)
by David S. Miller <davem@davemloft.net>:
On Fri, 2 Dec 2022 13:18:33 +0800 you wrote:
> If phy_device_register() or fwnode_mdiobus_phy_device_register()
> fail, phy_device_free() is called, the device refcount is decreased
> to 0, then fwnode_handle_put() will be called in phy_device_release(),
> but in the error path, fwnode_handle_put() has already been called,
> so set fwnode to NULL after fwnode_handle_put() in the error path to
> avoid double put.
>
> [...]
Here is the summary with links:
- [net,v3] net: mdiobus: fix double put fwnode in the error path
https://git.kernel.org/netdev/net/c/165df24186ec
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] 3+ messages in thread
end of thread, other threads:[~2022-12-05 11:10 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-12-02 5:18 [PATCH net v3] net: mdiobus: fix double put fwnode in the error path Yang Yingliang
2022-12-03 2:14 ` Zeng Heng
2022-12-05 11:10 ` patchwork-bot+netdevbpf
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.