]> Pileus Git - ~andy/linux/commitdiff
bonding: remove sysfs before removing devices
authorVeaceslav Falico <vfalico@redhat.com>
Wed, 3 Apr 2013 05:46:33 +0000 (05:46 +0000)
committerDavid S. Miller <davem@davemloft.net>
Fri, 5 Apr 2013 04:46:13 +0000 (00:46 -0400)
We have a race condition if we try to rmmod bonding and simultaneously add
a bond master through sysfs. In bonding_exit() we first remove the devices
(through rtnl_link_unregister() ) and only after that we remove the sysfs.
If we manage to add a device through sysfs after that the devices were
removed - we'll end up with that device/sysfs structure and with the module
unloaded.

Fix this by first removing the sysfs and only after that calling
rtnl_link_unregister().

Signed-off-by: Veaceslav Falico <vfalico@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/bonding/bond_main.c

index a51241b2e62186b03b4958faa509c4cefc14d052..171b10f167a501a75fe8c7639c6d8dba0953f4b3 100644 (file)
@@ -4902,8 +4902,8 @@ static void __exit bonding_exit(void)
 
        bond_destroy_debugfs();
 
-       rtnl_link_unregister(&bond_link_ops);
        unregister_pernet_subsys(&bond_net_ops);
+       rtnl_link_unregister(&bond_link_ops);
 
 #ifdef CONFIG_NET_POLL_CONTROLLER
        /*