Commit 328fbe74 authored by Kirill Tkhai's avatar Kirill Tkhai Committed by David S. Miller

net: Close race between {un, }register_netdevice_notifier() and setup_net()/cleanup_net()

{un,}register_netdevice_notifier() iterate over all net namespaces
hashed to net_namespace_list. But pernet_operations register and
unregister netdevices in unhashed net namespace, and they are not
seen for netdevice notifiers. This results in asymmetry:

1)Race with register_netdevice_notifier()
  pernet_operations::init(net)	...
   register_netdevice()		...
    call_netdevice_notifiers()  ...
      ... nb is not called ...
  ...				register_netdevice_notifier(nb) -> net skipped
  ...				...
  list_add_tail(&net->list, ..) ...

  Then, userspace stops using net, and it's destructed:

  pernet_operations::exit(net)
   unregister_netdevice()
    call_netdevice_notifiers()
      ... nb is called ...

This always happens with net::loopback_dev, but it may be not the only device.

2)Race with unregister_netdevice_notifier()
  pernet_operations::init(net)
   register_netdevice()
    call_netdevice_notifiers()
      ... nb is called ...

  Then, userspace stops using net, and it's destructed:

  list_del_rcu(&net->list)	...
  pernet_operations::exit(net)  unregister_netdevice_notifier(nb) -> net skipped
   dev_change_net_namespace()	...
    call_netdevice_notifiers()
      ... nb is not called ...
   unregister_netdevice()
    call_netdevice_notifiers()
      ... nb is not called ...

This race is more danger, since dev_change_net_namespace() moves real
network devices, which use not trivial netdevice notifiers, and if this
will happen, the system will be left in unpredictable state.

The patch closes the race. During the testing I found two places,
where register_netdevice_notifier() is called from pernet init/exit
methods (which led to deadlock) and fixed them (see previous patches).

The review moved me to one more unusual registration place:
raw_init() (can driver). It may be a reason of problems,
if someone creates in-kernel CAN_RAW sockets, since they
will be destroyed in exit method and raw_release()
will call unregister_netdevice_notifier(). But grep over
kernel tree does not show, someone creates such sockets
from kernel space.

Theoretically, there can be more places like this, and which are
hidden from review, but we found them on the first bumping there
(since there is no a race, it will be 100% reproducible).
Signed-off-by: default avatarKirill Tkhai <ktkhai@virtuozzo.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 9e2f6c5d
...@@ -1625,6 +1625,8 @@ int register_netdevice_notifier(struct notifier_block *nb) ...@@ -1625,6 +1625,8 @@ int register_netdevice_notifier(struct notifier_block *nb)
struct net *net; struct net *net;
int err; int err;
/* Close race with setup_net() and cleanup_net() */
down_write(&pernet_ops_rwsem);
rtnl_lock(); rtnl_lock();
err = raw_notifier_chain_register(&netdev_chain, nb); err = raw_notifier_chain_register(&netdev_chain, nb);
if (err) if (err)
...@@ -1649,6 +1651,7 @@ int register_netdevice_notifier(struct notifier_block *nb) ...@@ -1649,6 +1651,7 @@ int register_netdevice_notifier(struct notifier_block *nb)
unlock: unlock:
rtnl_unlock(); rtnl_unlock();
up_write(&pernet_ops_rwsem);
return err; return err;
rollback: rollback:
...@@ -1694,6 +1697,8 @@ int unregister_netdevice_notifier(struct notifier_block *nb) ...@@ -1694,6 +1697,8 @@ int unregister_netdevice_notifier(struct notifier_block *nb)
struct net *net; struct net *net;
int err; int err;
/* Close race with setup_net() and cleanup_net() */
down_write(&pernet_ops_rwsem);
rtnl_lock(); rtnl_lock();
err = raw_notifier_chain_unregister(&netdev_chain, nb); err = raw_notifier_chain_unregister(&netdev_chain, nb);
if (err) if (err)
...@@ -1713,6 +1718,7 @@ int unregister_netdevice_notifier(struct notifier_block *nb) ...@@ -1713,6 +1718,7 @@ int unregister_netdevice_notifier(struct notifier_block *nb)
up_read(&net_rwsem); up_read(&net_rwsem);
unlock: unlock:
rtnl_unlock(); rtnl_unlock();
up_write(&pernet_ops_rwsem);
return err; return err;
} }
EXPORT_SYMBOL(unregister_netdevice_notifier); EXPORT_SYMBOL(unregister_netdevice_notifier);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment