redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

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>
(cherry picked from commit 209b01104beff05c934b0c2bb5db9972dca80c3c)
5.4-rM2-2.2.x-imx-squashed
Alex Marginean 2020-01-07 16:50:31 +02:00 committed by Jason Liu
parent 0b5b1c553d
commit 79a17fee26
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/net/phy/phy-core.c
View File

@ -379,7 +379,7 @@ int __phy_read_mmd(struct phy_device *phydev, int devad, u32 regnum)
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 *phydev, int devad, u32 regnum, u16 val)
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);