Skip to content

Commit 0795b05

Browse files
Wei Fangkuba-moo
authored andcommitted
net: phy: clear phydev->devlink when the link is deleted
There is a potential crash issue when disabling and re-enabling the network port. When disabling the network port, phy_detach() calls device_link_del() to remove the device link, but it does not clear phydev->devlink, so phydev->devlink is not a NULL pointer. Then the network port is re-enabled, but if phy_attach_direct() fails before calling device_link_add(), the code jumps to the "error" label and calls phy_detach(). Since phydev->devlink retains the old value from the previous attach/detach cycle, device_link_del() uses the old value, which accesses a NULL pointer and causes a crash. The simplified crash log is as follows. [ 24.702421] Call trace: [ 24.704856] device_link_put_kref+0x20/0x120 [ 24.709124] device_link_del+0x30/0x48 [ 24.712864] phy_detach+0x24/0x168 [ 24.716261] phy_attach_direct+0x168/0x3a4 [ 24.720352] phylink_fwnode_phy_connect+0xc8/0x14c [ 24.725140] phylink_of_phy_connect+0x1c/0x34 Therefore, phydev->devlink needs to be cleared when the device link is deleted. Fixes: bc66fa8 ("net: phy: Add link between phy dev and mac dev") Signed-off-by: Wei Fang <[email protected]> Reviewed-by: Andrew Lunn <[email protected]> Reviewed-by: Florian Fainelli <[email protected]> Link: https://patch.msgid.link/[email protected] Signed-off-by: Jakub Kicinski <[email protected]>
1 parent d8d85ef commit 0795b05

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

drivers/net/phy/phy_device.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1727,8 +1727,10 @@ void phy_detach(struct phy_device *phydev)
17271727
struct module *ndev_owner = NULL;
17281728
struct mii_bus *bus;
17291729

1730-
if (phydev->devlink)
1730+
if (phydev->devlink) {
17311731
device_link_del(phydev->devlink);
1732+
phydev->devlink = NULL;
1733+
}
17321734

17331735
if (phydev->sysfs_links) {
17341736
if (dev)

0 commit comments

Comments
 (0)