| From 8e515a39805c013229698e1a142e16701f07edf9 Mon Sep 17 00:00:00 2001 |
| From: Alex Marginean <alexandru.marginean@nxp.com> |
| Date: Tue, 7 Jan 2020 16:50:31 +0200 |
| Subject: [PATCH] drivers: net: phy: don't crash in phy_read/_write_mmd without |
| a PHY driver |
| |
| The APIs can be used by Ethernet drivers to configure internal PHYs |
| without actually loading a PHY driver. Check that drv is not NULL before |
| reading from it. |
| |
| Signed-off-by: Alex Marginean <alexandru.marginean@nxp.com> |
| --- |
| drivers/net/phy/phy-core.c | 4 ++-- |
| 1 file changed, 2 insertions(+), 2 deletions(-) |
| |
| --- a/drivers/net/phy/phy-core.c |
| +++ b/drivers/net/phy/phy-core.c |
| @@ -379,7 +379,7 @@ int __phy_read_mmd(struct phy_device *ph |
| if (regnum > (u16)~0 || devad > 32) |
| return -EINVAL; |
| |
| - if (phydev->drv->read_mmd) { |
| + if (phydev->drv && phydev->drv->read_mmd) { |
| val = phydev->drv->read_mmd(phydev, devad, regnum); |
| } else if (phydev->is_c45) { |
| u32 addr = MII_ADDR_C45 | (devad << 16) | (regnum & 0xffff); |
| @@ -436,7 +436,7 @@ int __phy_write_mmd(struct phy_device *p |
| if (regnum > (u16)~0 || devad > 32) |
| return -EINVAL; |
| |
| - if (phydev->drv->write_mmd) { |
| + if (phydev->drv && phydev->drv->write_mmd) { |
| ret = phydev->drv->write_mmd(phydev, devad, regnum, val); |
| } else if (phydev->is_c45) { |
| u32 addr = MII_ADDR_C45 | (devad << 16) | (regnum & 0xffff); |