diff options
| author |   Ioana Ciornei <ioana.ciornei@nxp.com> | 2019-05-28 20:38:09 +0300 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2019-05-29 21:48:53 -0700 |
| commit | 82c76aca81187b3d28a6fb3062f6916450ce955e (patch) | |
| tree | 9e3ed72f28425e9b3c3910eab392a6361975c8b6 /drivers/net | |
| parent | net: phy: Guard against the presence of a netdev (diff) | |
| download | linux-dev-82c76aca81187b3d28a6fb3062f6916450ce955e.tar.xz linux-dev-82c76aca81187b3d28a6fb3062f6916450ce955e.zip | |
net: phy: Check against net_device being NULL
In general, we don't want MAC drivers calling phy_attach_direct with the
net_device being NULL. Add checks against this in all the functions
calling it: phy_attach() and phy_connect_direct().
Signed-off-by: Ioana Ciornei <ioana.ciornei@nxp.com>
Suggested-by: Andrew Lunn <andrew@lunn.ch>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/phy/phy_device.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c index da3bf3f70d63..1b540ed9b326 100644 --- a/drivers/net/phy/phy_device.c +++ b/drivers/net/phy/phy_device.c @@ -948,6 +948,9 @@ int phy_connect_direct(struct net_device *dev, struct phy_device *phydev, { int rc; + if (!dev) + return -EINVAL; + rc = phy_attach_direct(dev, phydev, phydev->dev_flags, interface); if (rc) return rc; @@ -1307,6 +1310,9 @@ struct phy_device *phy_attach(struct net_device *dev, const char *bus_id, struct device *d; int rc; + if (!dev) + return ERR_PTR(-EINVAL); + /* Search the list of PHY devices on the mdio bus for the * PHY with the requested name */ |