diff options
| author | Florian Fainelli <f.fainelli@gmail.com> | 2017-02-17 16:07:34 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-02-20 10:15:11 -0500 |
| commit | 25149ef9d25cafc4f4fe9f4461f18f876f397417 (patch) | |
| tree | acc10c699ffcb5ceed825af9f051971f94387b09 /drivers/net/phy/phy_device.c | |
| parent | 7b9a88a390dacb37b051a7b09b9a08f546edf5eb (diff) | |
| download | blackbird-op-linux-25149ef9d25cafc4f4fe9f4461f18f876f397417.tar.gz blackbird-op-linux-25149ef9d25cafc4f4fe9f4461f18f876f397417.zip | |
net: phy: Check phydev->drv
There are number of function calls, originating from user-space,
typically through the Ethernet driver that can make us crash by
dereferencing phydev->drv which will be NULL once we unbind the driver
from the PHY.
There are still functional issues that prevent an unbind then rebind to
work, but these will be addressed separately.
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>
Diffstat (limited to 'drivers/net/phy/phy_device.c')
| -rw-r--r-- | drivers/net/phy/phy_device.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c index 7f9319586b7e..daec6555f3b1 100644 --- a/drivers/net/phy/phy_device.c +++ b/drivers/net/phy/phy_device.c @@ -1094,7 +1094,7 @@ int phy_suspend(struct phy_device *phydev) if (wol.wolopts) return -EBUSY; - if (phydrv->suspend) + if (phydev->drv && phydrv->suspend) ret = phydrv->suspend(phydev); if (ret) @@ -1111,7 +1111,7 @@ int phy_resume(struct phy_device *phydev) struct phy_driver *phydrv = to_phy_driver(phydev->mdio.dev.driver); int ret = 0; - if (phydrv->resume) + if (phydev->drv && phydrv->resume) ret = phydrv->resume(phydev); if (ret) @@ -1790,7 +1790,7 @@ static int phy_remove(struct device *dev) phydev->state = PHY_DOWN; mutex_unlock(&phydev->lock); - if (phydev->drv->remove) + if (phydev->drv && phydev->drv->remove) phydev->drv->remove(phydev); phydev->drv = NULL; |
