| From foo@baz Wed Apr 11 10:26:56 CEST 2018 |
| From: Xin Long <lucien.xin@gmail.com> |
| Date: Mon, 26 Mar 2018 01:16:47 +0800 |
| Subject: bonding: process the err returned by dev_set_allmulti properly in bond_enslave |
| |
| From: Xin Long <lucien.xin@gmail.com> |
| |
| |
| [ Upstream commit 9f5a90c107741b864398f4ac0014711a8c1d8474 ] |
| |
| When dev_set_promiscuity(1) succeeds but dev_set_allmulti(1) fails, |
| dev_set_promiscuity(-1) should be done before going to the err path. |
| Otherwise, dev->promiscuity will leak. |
| |
| Fixes: 7e1a1ac1fbaa ("bonding: Check return of dev_set_promiscuity/allmulti") |
| Signed-off-by: Xin Long <lucien.xin@gmail.com> |
| Acked-by: Andy Gospodarek <andy@greyhouse.net> |
| Signed-off-by: David S. Miller <davem@davemloft.net> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| drivers/net/bonding/bond_main.c | 5 ++++- |
| 1 file changed, 4 insertions(+), 1 deletion(-) |
| |
| --- a/drivers/net/bonding/bond_main.c |
| +++ b/drivers/net/bonding/bond_main.c |
| @@ -1700,8 +1700,11 @@ int bond_enslave(struct net_device *bond |
| /* set allmulti level to new slave */ |
| if (bond_dev->flags & IFF_ALLMULTI) { |
| res = dev_set_allmulti(slave_dev, 1); |
| - if (res) |
| + if (res) { |
| + if (bond_dev->flags & IFF_PROMISC) |
| + dev_set_promiscuity(slave_dev, -1); |
| goto err_sysfs_del; |
| + } |
| } |
| |
| netif_addr_lock_bh(bond_dev); |
