[ 3.5.y.z extended stable ] Patch "bonding: IFF_BONDING is not stripped on enslave failure" has been added to staging queue

[Luis Henriques]

This is a note to let you know that I have just added a patch titled

    bonding: IFF_BONDING is not stripped on enslave failure

to the linux-3.5.y-queue branch of the 3.5.y.z extended stable tree 
which can be found at:

 http://kernel.ubuntu.com/git?p=ubuntu/linux.git;a=shortlog;h=refs/heads/linux-3.5.y-queue

If you, or anyone else, feels it should not be added to this tree, please 
reply to this email.

For more information about the 3.5.y.z tree, see
https://wiki.ubuntu.com/Kernel/Dev/ExtendedStable

Thanks.
-Luis

------

>From 16c74523eab82ec89d21a83304ec8e3b86da3437 Mon Sep 17 00:00:00 2001
From: "nikolay at redhat.com" <nikolay at redhat.com>
Date: Thu, 11 Apr 2013 09:18:56 +0000
Subject: [PATCH] bonding: IFF_BONDING is not stripped on enslave failure

commit b6a5a7b9a528a8b4c8bec940b607c5dd9102b8cc upstream.

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 at redhat.com>
Signed-off-by: David S. Miller <davem at davemloft.net>
Signed-off-by: Luis Henriques <luis.henriques at canonical.com>
---
 drivers/net/bonding/bond_main.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index 5fc31a1..1e1ae64 100644
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -1897,6 +1897,7 @@ err_detach:
 	write_unlock_bh(&bond->lock);

 err_close:
+	slave_dev->priv_flags &= ~IFF_BONDING;
 	dev_close(slave_dev);

 err_unset_master:
--
1.8.1.2