mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-11-17 01:04:19 +08:00
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>
This commit is contained in:
parent
2db2d9d1ac
commit
82c76aca81
@ -948,6 +948,9 @@ int phy_connect_direct(struct net_device *dev, struct phy_device *phydev,
|
|||||||
{
|
{
|
||||||
int rc;
|
int rc;
|
||||||
|
|
||||||
|
if (!dev)
|
||||||
|
return -EINVAL;
|
||||||
|
|
||||||
rc = phy_attach_direct(dev, phydev, phydev->dev_flags, interface);
|
rc = phy_attach_direct(dev, phydev, phydev->dev_flags, interface);
|
||||||
if (rc)
|
if (rc)
|
||||||
return rc;
|
return rc;
|
||||||
@ -1307,6 +1310,9 @@ struct phy_device *phy_attach(struct net_device *dev, const char *bus_id,
|
|||||||
struct device *d;
|
struct device *d;
|
||||||
int rc;
|
int rc;
|
||||||
|
|
||||||
|
if (!dev)
|
||||||
|
return ERR_PTR(-EINVAL);
|
||||||
|
|
||||||
/* Search the list of PHY devices on the mdio bus for the
|
/* Search the list of PHY devices on the mdio bus for the
|
||||||
* PHY with the requested name
|
* PHY with the requested name
|
||||||
*/
|
*/
|
||||||
|
Loading…
Reference in New Issue
Block a user