android/android_kernel_samsung_sm8650
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

net: phy: prevent stale pointer dereference in phy_init()

Browse Source 
[ Upstream commit 1c613beaf877c0c0d755853dc62687e2013e55c4 ]

mdio_bus_init() and phy_driver_register() both have error paths, and if
those are ever hit, ethtool will have a stale pointer to the
phy_ethtool_phy_ops stub structure, which references memory from a
module that failed to load (phylib).

It is probably hard to force an error in this code path even manually,
but the error teardown path of phy_init() should be the same as
phy_exit(), which is now simply not the case.

Fixes: 55d8f053ce ("net: phy: Register ethtool PHY operations")
Link: https://lore.kernel.org/netdev/ZLaiJ4G6TaJYGJyU@shell.armlinux.org.uk/
Suggested-by: Russell King (Oracle) <linux@armlinux.org.uk>
Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
Link: https://lore.kernel.org/r/20230720000231.1939689-1-vladimir.oltean@nxp.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Vladimir Oltean 2023-07-20 03:02:31 +03:00 committed by Greg Kroah-Hartman
parent f311c76800
commit b9f0f20ab0
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
drivers/net/phy/phy_device.c
View File

@ -3252,23 +3252,30 @@ static int __init phy_init(void)
{ {
int rc; int rc;
ethtool_set_ethtool_phy_ops(&phy_ethtool_phy_ops);
rc = mdio_bus_init(); rc = mdio_bus_init();
if (rc) if (rc)
return rc; goto err_ethtool_phy_ops;
ethtool_set_ethtool_phy_ops(&phy_ethtool_phy_ops);
features_init(); features_init();
rc = phy_driver_register(&genphy_c45_driver, THIS_MODULE); rc = phy_driver_register(&genphy_c45_driver, THIS_MODULE);
if (rc) if (rc)
goto err_c45; goto err_mdio_bus;
rc = phy_driver_register(&genphy_driver, THIS_MODULE); rc = phy_driver_register(&genphy_driver, THIS_MODULE);
if (rc) { if (rc)
phy_driver_unregister(&genphy_c45_driver); goto err_c45;
return 0;
err_c45: err_c45:
mdio_bus_exit(); phy_driver_unregister(&genphy_c45_driver);
} err_mdio_bus:
mdio_bus_exit();
err_ethtool_phy_ops:
ethtool_set_ethtool_phy_ops(NULL);
return rc; return rc;
} }