net: phy: fix potential use of NULL pointer in phy_suspend()
Subsystems (3)
PATCH 1/1 net: phy: fix potential use of NULL pointer in phy_suspend()
phy_suspend() checks the WoL status, and then dereferences phydrv->flags if (and only if) we decided that WoL has been enabled on either the PHY or the netdev.
We then check whether phydrv was NULL, but we've potentially already dereferenced the pointer.
If phydrv is NULL, then phy_ethtool_get_wol() will return an error and leave wol.wolopts set to zero. However, if netdev->wol_enabled is true, then we would dereference a NULL pointer.
Checking the PHY drivers, the only place that phydev->wol_enabled is checked by them is in their suspend/resume callbacks and nowhere else (which is correct, because phylib only updates this in phy_suspend()).
So, move the NULL pointer check earlier to avoid a NULL pointer dereference. Leave the check for phydrv->suspend in place as a driver may populate the .resume method but not the .suspend method.
--- drivers/net/phy/phy_device.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/phy/phy_device.c +2 -2
@@ -1980,7 +1980,7 @@ int phy_suspend(struct phy_device *phydev)const struct phy_driver *phydrv = phydev->drv;int ret; -if (phydev->suspended) +if (phydev->suspended || !phydrv)return 0 ;phy_ethtool_get_wol (phydev, &wol);
@@ -1989,7 +1989,7 @@ int phy_suspend(struct phy_device *phydev)if (phydev->wol_enabled && !(phydrv->flags &PHY_ALWAYS_CALL_SUSPEND ))return -EBUSY ; -if (!phydrv || !phydrv->suspend) +if (!phydrv->suspend)return 0 ; ret = phydrv->suspend (phydev);
Signature · 1 line
2.30.2
Russell King (Oracle)
reviewerQuoted 15 lines · Russell King (Oracle)
phy_suspend()checks the WoL status, and then dereferencesphydrv->flagsif (and only if) we decided that WoL has been enabled on either the PHY or the netdev.We then check whether phydrv was NULL, but we've potentially already dereferenced the pointer.
If phydrv is NULL, then
phy_ethtool_get_wol()will return an error and leave wol.wolopts set to zero. However, ifnetdev->wol_enabledis true, then we would dereference a NULL pointer.Checking the PHY drivers, the only place that
phydev->wol_enabledis checked by them is in their suspend/resume callbacks and nowhere else (which is correct, because phylib only updates this inphy_suspend()).
Quoted 6 lines
So, move the NULL pointer check earlier to avoid a NULL pointer dereference. Leave the check for
phydrv->suspendin place as a driver may populate the .resume method but not the .suspend method.Signed-off-by Russell King (Oracle) <[email protected]>---
Note - I don't believe anyone has hit this condition, so maybe we want the patch for net-next rather than net? For now I have the patch against both trees so let me know which you'd prefer.
Quoted 29 lines
drivers/net/phy/phy_device.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)drivers/net/phy/phy_device.c +2
-2@@ -1980,7 +1980,7 @@ int phy_suspend(struct phy_device *phydev)const struct phy_driver *phydrv = phydev->drv;int ret; -if (phydev->suspended) +if (phydev->suspended || !phydrv)return 0 ;phy_ethtool_get_wol (phydev, &wol);@@ -1989,7 +1989,7 @@ int phy_suspend(struct phy_device *phydev)if (phydev->wol_enabled && !(phydrv->flags &PHY_ALWAYS_CALL_SUSPEND ))return -EBUSY ; -if (!phydrv || !phydrv->suspend) +if (!phydrv->suspend)return 0 ; ret = phydrv->suspend (phydev);Signature · 1 line
2.30.2
Signature · 2 lines
RMK's Patch system: https://www.armlinux.org.uk/developer/patches/ FTTP is here! 80Mbps down 10Mbps up. Decent connectivity at last!
Quoted 15 lines · Russell King (Oracle)
phy_suspend()checks the WoL status, and then dereferencesphydrv->flagsif (and only if) we decided that WoL has been enabled on either the PHY or the netdev.We then check whether phydrv was NULL, but we've potentially already dereferenced the pointer.
If phydrv is NULL, then
phy_ethtool_get_wol()will return an error and leave wol.wolopts set to zero. However, ifnetdev->wol_enabledis true, then we would dereference a NULL pointer.Checking the PHY drivers, the only place that
phydev->wol_enabledis checked by them is in their suspend/resume callbacks and nowhere else (which is correct, because phylib only updates this inphy_suspend()).
Quoted 5 lines
So, move the NULL pointer check earlier to avoid a NULL pointer dereference. Leave the check for
phydrv->suspendin place as a driver may populate the .resume method but not the .suspend method.Signed-off-by Russell King (Oracle) <[email protected]>
As you say, nobody has reported this. So i think net-next is sufficient.
Andrew
This patch was applied to netdev/net-next.git (main) by Jakub Kicinski <[email protected]>:
Hello:
This patch was applied to netdev/net-next.git (main) by Jakub Kicinski <[email protected]>:
Quoted 8 lines · On Fri, 28 Jun 2024 11:32:11 +0100 you wrote:
phy_suspend()checks the WoL status, and then dereferencesphydrv->flagsif (and only if) we decided that WoL has been enabled on either the PHY or the netdev.We then check whether phydrv was NULL, but we've potentially already dereferenced the pointer.
[...]
Here is the summary with links:
- [net] net: phy: fix potential use of NULL pointer in phy_suspend()
https://git.kernel.org/netdev/net-next/c/19e6ad2c7578
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html