projects / GitHub / exynos8895 / android_kernel_samsung_universal8895.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 6101391)
bonding: IFF_BONDING is not stripped on enslave failure
authornikolay@redhat.com <nikolay@redhat.com>
Thu, 11 Apr 2013 09:18:56 +0000 (09:18 +0000)
committerDavid S. Miller <davem@davemloft.net>
Thu, 11 Apr 2013 20:01:47 +0000 (16:01 -0400)
While enslaving a new device and after IFF_BONDING flag is set, in case
of failure it is not stripped from the device's priv_flags while
cleaning up, which could lead to other problems.
Cleaning at err_close because the flag is set after dev_open().

v2: no change

Signed-off-by: Nikolay Aleksandrov <nikolay@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/bonding/bond_main.c patch | blob | blame | history

diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index e074c6b555175395f20ec7bf1eb3664716c54964..a61a760484f7e28f8df703b38876d987824275fa 100644 (file)
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -1906,6 +1906,7 @@ err_detach:
        write_unlock_bh(&bond->lock);
 
 err_close:
+       slave_dev->priv_flags &= ~IFF_BONDING;
        dev_close(slave_dev);
 
 err_unset_master: