Skip to content

Commit 7ebf301

Browse files
avagingregkh
authored andcommitted
net: use net->count to check whether a netns is alive or not
[ Upstream commit 91864f5 ] The previous idea was to check whether a net namespace is in net_exit_list or not. It doesn't work, because net->exit_list is used in __register_pernet_operations and __unregister_pernet_operations where all namespaces are added to a temporary list to make cleanup in a error case, so list_empty(&net->exit_list) always returns false. Reported-by: Mantas Mikulėnas <[email protected]> Fixes: 002d8a1 ("net: skip genenerating uevents for network namespaces that are exiting") Signed-off-by: Andrei Vagin <[email protected]> Signed-off-by: David S. Miller <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent 4780887 commit 7ebf301

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

net/core/net-sysfs.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -952,7 +952,7 @@ net_rx_queue_update_kobjects(struct net_device *dev, int old_num, int new_num)
952952
while (--i >= new_num) {
953953
struct kobject *kobj = &dev->_rx[i].kobj;
954954

955-
if (!list_empty(&dev_net(dev)->exit_list))
955+
if (!atomic_read(&dev_net(dev)->count))
956956
kobj->uevent_suppress = 1;
957957
if (dev->sysfs_rx_queue_group)
958958
sysfs_remove_group(kobj, dev->sysfs_rx_queue_group);
@@ -1370,7 +1370,7 @@ netdev_queue_update_kobjects(struct net_device *dev, int old_num, int new_num)
13701370
while (--i >= new_num) {
13711371
struct netdev_queue *queue = dev->_tx + i;
13721372

1373-
if (!list_empty(&dev_net(dev)->exit_list))
1373+
if (!atomic_read(&dev_net(dev)->count))
13741374
queue->kobj.uevent_suppress = 1;
13751375
#ifdef CONFIG_BQL
13761376
sysfs_remove_group(&queue->kobj, &dql_group);
@@ -1557,7 +1557,7 @@ void netdev_unregister_kobject(struct net_device *ndev)
15571557
{
15581558
struct device *dev = &(ndev->dev);
15591559

1560-
if (!list_empty(&dev_net(ndev)->exit_list))
1560+
if (!atomic_read(&dev_net(ndev)->count))
15611561
dev_set_uevent_suppress(dev, 1);
15621562

15631563
kobject_get(&dev->kobj);

0 commit comments

Comments
 (0)