summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorin Malita <fmalita@gmail.com>2005-09-18 07:24:12 (GMT)
committerDavid S. Miller <davem@davemloft.net>2005-09-18 07:24:12 (GMT)
commit40abc27066c49b2c13c817154d438431b0303b96 (patch)
tree0e5b000311e1729892c4595c0dbe106b987d577e
parent88f964db6ef728982734356bf4c406270ea29c1d (diff)
downloadlinux-3.10-40abc27066c49b2c13c817154d438431b0303b96.zip
linux-3.10-40abc27066c49b2c13c817154d438431b0303b96.tar.gz
linux-3.10-40abc27066c49b2c13c817154d438431b0303b96.tar.bz2
[BOND]: Fix bond_init() error path handling.
From: Florin Malita <fmalita@gmail.com> bond_init() is not releasing rtnl_sem after register_netdevice() and before calling unregister_netdevice() (from bond_free_all()) in the exception path. As the device registration is not completed (dev->reg_state == NETREG_REGISTERING), the call to unregister_netdevice() triggers BUG_ON(dev->reg_state != NETREG_REGISTERED). Signed-off-by: Florin Malita <fmalita@gmail.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/bonding/bond_main.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index f8dedb6..90449a0 100644
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -5039,6 +5039,14 @@ static int __init bonding_init(void)
return 0;
out_err:
+ /*
+ * rtnl_unlock() will run netdev_run_todo(), putting the
+ * thus-far-registered bonding devices into a state which
+ * unregigister_netdevice() will accept
+ */
+ rtnl_unlock();
+ rtnl_lock();
+
/* free and unregister all bonds that were successfully added */
bond_free_all();