Skip to content

Commit

Permalink
netns: foreach_netdev_safe is insufficient in default_device_exit
Browse files Browse the repository at this point in the history
During network namespace teardown we either move or delete
all of the network devices associated with a network namespace.
In the case of veth devices deleting one will also delete it's
pair device.  If both devices are in the same network namespace
then for_each_netdev_safe is insufficient as next may point
to the second veth device we have deleted.

To avoid problems I do what we do in __rtnl_kill_links and
restart the scan of the device list, after we have deleted
a device.

Currently dev_change_netnamespace does not appear to suffer from
this problem, but wireless devices are also paired and likely
should be moved between network namespaces together.  So I have
errored on the side of caution and restart the scan of the network
devices in that case as well.

Signed-off-by: Eric W. Biederman <ebiederm@aristanetworks.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Eric W. Biederman authored and David S. Miller committed Dec 30, 2008
1 parent 91b208c commit 8eb7986
Showing 1 changed file with 5 additions and 3 deletions.
8 changes: 5 additions & 3 deletions net/core/dev.c
Original file line number Diff line number Diff line change
Expand Up @@ -5066,13 +5066,14 @@ static struct pernet_operations __net_initdata netdev_net_ops = {

static void __net_exit default_device_exit(struct net *net)
{
struct net_device *dev, *next;
struct net_device *dev;
/*
* Push all migratable of the network devices back to the
* initial network namespace
*/
rtnl_lock();
for_each_netdev_safe(net, dev, next) {
restart:
for_each_netdev(net, dev) {
int err;
char fb_name[IFNAMSIZ];

Expand All @@ -5083,7 +5084,7 @@ static void __net_exit default_device_exit(struct net *net)
/* Delete virtual devices */
if (dev->rtnl_link_ops && dev->rtnl_link_ops->dellink) {
dev->rtnl_link_ops->dellink(dev);
continue;
goto restart;
}

/* Push remaing network devices to init_net */
Expand All @@ -5094,6 +5095,7 @@ static void __net_exit default_device_exit(struct net *net)
__func__, dev->name, err);
BUG();
}
goto restart;
}
rtnl_unlock();
}
Expand Down

0 comments on commit 8eb7986

Please sign in to comment.