Skip to contentSkip to conversation

ieee802154: keep the original error after a netns rollback

PATCH In review Andrey Misiurov 2 participants 2 messages Nov 20

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 ieee802154: keep the original error after a netns rollback

cfg802154_switch_netns() moves all of a phy's netdevs into a new netns. If one move fails, it jumps to the errout label and moves the already-moved netdevs back to the old netns.

That rollback loop overwrites the same 'err' variable with the result of each move-back. The move-backs succeed, so 'err' ends up 0 and the function returns 0 -- success -- even though nothing moved and the phy stayed in the old netns. nl802154_wpan_phy_netns() then tells userspace the move worked.

Give the rollback loop its own 'err' so the original error survives and is returned.

Fixes 66e5c2672cd1 ("ieee802154: add netns support")

---
v2: shadow 'err' inside the rollback loop instead of adding a separate
variable next to it (Miquel Raynal).

Found during a backport review.

On debian13 6.12.88, "iwpan phy phy0 set netns name T" reported success (returned 0) while phy0 and its wpan0 interface stayed in the original namespace; internally the move had failed with -EEXIST, but the function returned 0 anyway. With the fix the same command correctly fails with "File exists".

 net/ieee802154/core.c | 2 ++
 1 file changed, 2 insertions(+)
net/ieee802154/core.c +2 -0
@@ -255,6 +255,8 @@ errout:
 	list_for_each_entry_continue_reverse(wpan_dev,
 					     &rdev->wpan_dev_list,
 					     list) {
+		int err;
+
 		if (!wpan_dev->netdev)
 			continue;
 		wpan_dev->netdev->netns_immutable = false;
maintainer Reviewed-by on v2 1/1
#1 lore raw
Quoted 9 lines · Andrey Misiurov

cfg802154_switch_netns() moves all of a phy's netdevs into a new netns. If one move fails, it jumps to the errout label and moves the already-moved netdevs back to the old netns.

That rollback loop overwrites the same 'err' variable with the result of each move-back. The move-backs succeed, so 'err' ends up 0 and the function returns 0 -- success -- even though nothing moved and the phy stayed in the old netns. nl802154_wpan_phy_netns() then tells userspace the move worked.

Quoted 5 lines

Give the rollback loop its own 'err' so the original error survives and is returned.

Fixes 66e5c2672cd1 ("ieee802154: add netns support")