net: cpsw_new: Fix potential unregister of netdev that has not been registered yet
PATCH 1/1 net: cpsw_new: Fix potential unregister of netdev that has not been registered yet
From: Kevin Hao <[email protected]>
[ Upstream commit 9d724b34fbe13b71865ad0906a4be97571f19cf5 ]
If an error occurs during register_netdev() for the first MAC in cpsw_register_ports(), even though cpsw->slaves[0].ndev is set to NULL, cpsw->slaves[1].ndev would remain unchanged. This could later cause cpsw_unregister_ports() to attempt unregistering the second MAC. To address this, add a check for ndev->reg_state before calling unregister_netdev(). With this change, setting cpsw->slaves[i].ndev to NULL becomes unnecessary and can be removed accordingly.
--- drivers/net/ethernet/ti/cpsw_new.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/ethernet/ti/cpsw_new.c +2 -2
@@ -1443,7 +1443,8 @@ static void cpsw_unregister_ports(struct cpsw_common *cpsw)int i =0 ;for (i =0 ; i < cpsw->data.slaves; i++) { -if (!cpsw->slaves[i].ndev) +if (!cpsw->slaves[i].ndev || + cpsw->slaves[i].ndev->reg_state !=NETREG_REGISTERED )continue ;unregister_netdev (cpsw->slaves[i].ndev);
@@ -1463,7 +1464,6 @@ static int cpsw_register_ports(struct cpsw_common *cpsw)if (ret) {dev_err (cpsw->dev,"cpsw: err registering net device%d\n" , i); - cpsw->slaves[i].ndev =NULL ;break ; } }
Signature · 1 line
2.43.0
Sasha Levin
maintainerQuoted 1 line · Wenshan Lan
[PATCH 6.12.y] net:
cpsw_new: Fix potential unregister of netdev that has not been registered yet
Thanks. All four per-branch submissions (backports of upstream 9d724b34fbe1) are now applied:
6.12.y 5452443ce7e16b 6.6.y 59cbd3e205f322 6.1.y 051d4a307d558c 5.15.y f9ae7c1e69f317
Thanks,
Sasha