Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f611a5e1 authored by Xin Long's avatar Xin Long Committed by Greg Kroah-Hartman
Browse files

bonding: fix the err path for dev hwaddr sync in bond_enslave 




[ Upstream commit 5c78f6bfae2b10ff70e21d343e64584ea6280c26 ]

vlan_vids_add_by_dev is called right after dev hwaddr sync, so on
the err path it should unsync dev hwaddr. Otherwise, the slave
dev's hwaddr will never be unsync when this err happens.

Fixes: 1ff412ad ("bonding: change the bond's vlan syncing functions with the standard ones")
Signed-off-by: default avatarXin Long <lucien.xin@gmail.com>
Reviewed-by: default avatarNikolay Aleksandrov <nikolay@cumulusnetworks.com>
Acked-by: default avatarAndy Gospodarek <andy@greyhouse.net>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 2463af64

drivers/net/bonding/bond_main.c

+5 −4
Original line number Diff line number Diff line
@@ -1561,7 +1561,7 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev) 
	if (res) {

		netdev_err(bond_dev, "Couldn't add bond vlan ids to %s\n",

			   slave_dev->name);

		goto err_close;

		goto err_hwaddr_unsync;

	}



	prev_slave = bond_last_slave(bond);
@@ -1749,9 +1749,6 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev) 
	netdev_rx_handler_unregister(slave_dev);



err_detach:

	if (!bond_uses_primary(bond))

		bond_hw_addr_flush(bond_dev, slave_dev);



	vlan_vids_del_by_dev(slave_dev, bond_dev);

	if (rcu_access_pointer(bond->primary_slave) == new_slave)

		RCU_INIT_POINTER(bond->primary_slave, NULL);
@@ -1765,6 +1762,10 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev) 
	synchronize_rcu();

	slave_disable_netpoll(new_slave);



err_hwaddr_unsync:

	if (!bond_uses_primary(bond))

		bond_hw_addr_flush(bond_dev, slave_dev);



err_close:

	slave_dev->priv_flags &= ~IFF_BONDING;

	dev_close(slave_dev);