net: phy: Fix PHY unbind crash

[ Upstream commit 7b9a88a390dacb37b051a7b09b9a08f546edf5eb ]

The PHY library does not deal very well with bind and unbind events. The first
thing we would see is that we were not properly canceling the PHY state machine
workqueue, so we would be crashing while dereferencing phydev->drv since there
is no driver attached anymore.

Suggested-by: Russell King <rmk+kernel@armlinux.org.uk>
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>

diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c
index a4461643d1ef40b9c4ad30451a249d1d08aebba8..afb87840f8536cf0da77fa140aec4601cb2e5225 100644 (file)
--- a/drivers/net/phy/phy_device.c
+++ b/drivers/net/phy/phy_device.c
@@ -1281,6 +1281,8 @@ static int phy_remove(struct device *dev)
 {
        struct phy_device *phydev = to_phy_device(dev);
 
+       cancel_delayed_work_sync(&phydev->state_queue);
+
        mutex_lock(&phydev->lock);
        phydev->state = PHY_DOWN;
        mutex_unlock(&phydev->lock);