Commit f7d9821a authored by stephen hemminger's avatar stephen hemminger Committed by David S. Miller
Browse files

bonding: fix error handling if slave is busy (v2)

If slave device already has a receive handler registered, then the
error unwind of bonding device enslave function is broken.

The following will leave a pointer to freed memory in the slave
device list, causing a later kernel panic.
# modprobe dummy
# ip li add dummy0-1 link dummy0 type macvlan
# modprobe bonding
# echo +dummy0 >/sys/class/net/bond0/bonding/slaves

The fix is to detach the slave (which removes it from the list)
in the unwind path.
Signed-off-by: default avatarStephen Hemminger <>
Reviewed-by: default avatarNicolas de Pesloüan <>
Signed-off-by: default avatarDavid S. Miller <>
parent f872b237
......@@ -1822,7 +1822,7 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev)
"but new slave device does not support netpoll.\n",
res = -EBUSY;
goto err_close;
goto err_detach;
......@@ -1831,7 +1831,7 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev)
res = bond_create_slave_symlinks(bond_dev, slave_dev);
if (res)
goto err_close;
goto err_detach;
res = netdev_rx_handler_register(slave_dev, bond_handle_frame,
......@@ -1852,6 +1852,11 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev)
bond_destroy_slave_symlinks(bond_dev, slave_dev);
bond_detach_slave(bond, new_slave);
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