Skip to content

Commit 9d724b3

Browse files
haokexinkuba-moo
authored andcommitted
net: cpsw_new: Fix potential unregister of netdev that has not been registered yet
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. Fixes: ed3525e ("net: ethernet: ti: introduce cpsw switchdev based driver part 1 - dual-emac") Signed-off-by: Kevin Hao <[email protected]> Cc: [email protected] Reviewed-by: Alexander Sverdlin <[email protected]> Link: https://patch.msgid.link/[email protected] Signed-off-by: Jakub Kicinski <[email protected]>
1 parent 62db84b commit 9d724b3

1 file changed

Lines changed: 1 addition & 2 deletions

File tree

drivers/net/ethernet/ti/cpsw_new.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1472,7 +1472,7 @@ static void cpsw_unregister_ports(struct cpsw_common *cpsw)
14721472

14731473
for (i = 0; i < cpsw->data.slaves; i++) {
14741474
ndev = cpsw->slaves[i].ndev;
1475-
if (!ndev)
1475+
if (!ndev || ndev->reg_state != NETREG_REGISTERED)
14761476
continue;
14771477

14781478
priv = netdev_priv(ndev);
@@ -1494,7 +1494,6 @@ static int cpsw_register_ports(struct cpsw_common *cpsw)
14941494
if (ret) {
14951495
dev_err(cpsw->dev,
14961496
"cpsw: err registering net device%d\n", i);
1497-
cpsw->slaves[i].ndev = NULL;
14981497
break;
14991498
}
15001499
}

0 commit comments

Comments
 (0)