diff mbox series

[v2,net-next,03/11] net: phy: Check against net_device being NULL

Message ID 1559065097-31832-4-git-send-email-ioana.ciornei@nxp.com
State Accepted
Delegated to: David Miller
Headers show
Series Decoupling PHYLINK from struct net_device | expand

Commit Message

Ioana Ciornei May 28, 2019, 5:38 p.m. UTC 
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>
---
Changes in v2:
 - return directly -EINVAL instead of ERR_PTR(-EINVAL) in phy_connect_direct

 drivers/net/phy/phy_device.c | 6 ++++++
 1 file changed, 6 insertions(+)

Comments

Florian Fainelli May 28, 2019, 5:57 p.m. UTC | #1 
On 5/28/19 10:38 AM, Ioana Ciornei wrote:
> 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>
diff mbox series

Patch

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
 	 */