net: fix removing a namespace with conflicting altnames
Subsystems (2)
Jakub Kicinski
maintainerPATCH 1/1 net: fix removing a namespace with conflicting altnames
Mark reports a BUG() when a net namespace is removed.
kernel BUG at net/core/dev.c:11520!
Physical interfaces moved outside of init_net get "refunded" to init_net when that namespace disappears. The main interface name may get overwritten in the process if it would have conflicted. We need to also discard all conflicting altnames. Recent fixes addressed ensuring that altnames get moved with the main interface, which surfaced this problem.
---
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
I'll follow up with a conversion to RCU freeing in -next.
--- net/core/dev.c | 9 +++++++++ net/core/dev.h | 3 +++ 2 files changed, 12 insertions(+)
net/core/dev.c +9 -0
@@ -11551,6 +11551,7 @@ static struct pernet_operations __net_initdata netdev_net_ops = { static void __net_exit default_device_exit_net(struct net *net) { +struct netdev_name_node *name_node, *tmp;struct net_device *dev, *aux;/* * Push all migratable network devices back to the
@@ -11573,6 +11574,14 @@ static void __net_exit default_device_exit_net(struct net *net)snprintf (fb_name,IFNAMSIZ ,"dev%d" , dev->ifindex);if (netdev_name_in_use (&init_net, fb_name))snprintf (fb_name,IFNAMSIZ ,"dev%%d" ); + +netdev_for_each_altname_safe (dev, name_node, tmp) +if (netdev_name_in_use (&init_net, name_node->name)) { +netdev_name_node_del (name_node); +synchronize_rcu (); +__netdev_name_node_alt_destroy (name_node); + } + err =dev_change_net_namespace (dev, &init_net, fb_name);if (err) { pr_emerg("%s: failed to move %s to init_net: %d\n",
net/core/dev.h +3 -0
@@ -63,6 +63,9 @@ int dev_change_name(struct net_device *dev, const char *newname);#define netdev_for_each_altname (dev, namenode) \ list_for_each_entry((namenode), &(dev)->name_node->list, list) +#define netdev_for_each_altname_safe (dev, namenode, next) \ + list_for_each_entry_safe((namenode), (next), &(dev)->name_node->list, \ + list)int netdev_name_node_alt_create (struct net_device *dev,const char *name);int netdev_name_node_alt_destroy (struct net_device *dev,const char *name);
Signature · 1 line
2.43.0
Quoted 16 lines · Jakub Kicinski
Mark reports a
BUG()when a net namespace is removed.kernel BUG at net/core/dev.c:11520!Physical interfaces moved outside of
init_netget "refunded" toinit_netwhen that namespace disappears. The main interface name may get overwritten in the process if it would have conflicted. We need to also discard all conflicting altnames. Recent fixes addressed ensuring that altnames get moved with the main interface, which surfaced this problem.Reported-by Марк Коренберг <[email protected]>Link https://lore.kernel.org/all/CAEmTpZFZ4Sv3KwqFOY2WKDHeZYdi0O7N5H1nTvcGp=SAEavtDg@mail.gmail.com/ open hereFixes 7663d522099e ("net: check for altname conflicts when changing netdev's netns")Signed-off-by Jakub Kicinski <[email protected]>
Quoted 7 lines
---
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]I'll follow up with a conversion to RCU freeing in -next.
Okay then...
Quoted 11 lines · Fri, Jan 19, 2024 at 01:58:59AM CET, [email protected] wrote:
Mark reports a
BUG()when a net namespace is removed.kernel BUG at net/core/dev.c:11520!Physical interfaces moved outside of
init_netget "refunded" toinit_netwhen that namespace disappears. The main interface name may get overwritten in the process if it would have conflicted. We need to also discard all conflicting altnames. Recent fixes addressed ensuring that altnames get moved with the main interface, which surfaced this problem.
Quoted 4 lines
Reported-by Марк Коренберг <[email protected]>Link https://lore.kernel.org/all/CAEmTpZFZ4Sv3KwqFOY2WKDHeZYdi0O7N5H1nTvcGp=SAEavtDg@mail.gmail.com/ open hereFixes 7663d522099e ("net: check for altname conflicts when changing netdev's netns")Signed-off-by Jakub Kicinski <[email protected]>
Quoted 12 lines · Jakub Kicinski
Mark reports a
BUG()when a net namespace is removed.kernel BUG at net/core/dev.c:11520!Physical interfaces moved outside of
init_netget "refunded" toinit_netwhen that namespace disappears. The main interface name may get overwritten in the process if it would have conflicted. We need to also discard all conflicting altnames. Recent fixes addressed ensuring that altnames get moved with the main interface, which surfaced this problem.
Quoted 4 lines
Reported-by Марк Коренберг <[email protected]>Link https://lore.kernel.org/all/CAEmTpZFZ4Sv3KwqFOY2WKDHeZYdi0O7N5H1nTvcGp=SAEavtDg@mail.gmail.com/ open hereFixes 7663d522099e ("net: check for altname conflicts when changing netdev's netns")Signed-off-by Jakub Kicinski <[email protected]>
This patch was applied to netdev/net.git (main) by David S. Miller <[email protected]>:
Hello:
This patch was applied to netdev/net.git (main)
by David S. Miller <[email protected]>:
Quoted 4 lines · On Thu, 18 Jan 2024 16:58:59 -0800 you wrote:
Mark reports a
BUG()when a net namespace is removed.kernel BUG at net/core/dev.c:11520!
Quoted 8 lines
Physical interfaces moved outside of
init_netget "refunded" toinit_netwhen that namespace disappears. The main interface name may get overwritten in the process if it would have conflicted. We need to also discard all conflicting altnames. Recent fixes addressed ensuring that altnames get moved with the main interface, which surfaced this problem.[...]
Here is the summary with links:
- [net] net: fix removing a namespace with conflicting altnames
https://git.kernel.org/netdev/net/c/d09486a04f5d
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html