[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <51702FE9.3050506@redhat.com>
Date: Thu, 18 Apr 2013 19:39:53 +0200
From: Nikolay Aleksandrov <nikolay@...hat.com>
To: netdev@...r.kernel.org
CC: andy@...yhouse.net, fubar@...ibm.com, davem@...emloft.net
Subject: Re: [PATCHv3 3/5] bonding: primary_slave & curr_active_slave are
not cleaned on enslave failure
On 18/04/13 19:33, Nikolay Aleksandrov wrote:
> On enslave failure primary_slave can point to new_slave which is to be
> freed, and the same applies to curr_active_slave. So check if this is
> the case and clean up properly after err_detach because that's the first
> error code path after they're set.
>
> Signed-off-by: Nikolay Aleksandrov <nikolay@...hat.com>
> ---
> drivers/net/bonding/bond_main.c | 10 ++++++++++
> 1 file changed, 10 insertions(+)
>
> diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
> index 2e7fce0..c56e132 100644
> --- a/drivers/net/bonding/bond_main.c
> +++ b/drivers/net/bonding/bond_main.c
> @@ -1909,7 +1909,17 @@ err_detach:
> bond_del_vlans_from_slave(bond, slave_dev);
> write_lock_bh(&bond->lock);
> bond_detach_slave(bond, new_slave);
> + if (bond->primary_slave == new_slave)
> + bond->primary_slave = NULL;
> write_unlock_bh(&bond->lock);
> + if (bond->curr_active_slave == new_slave) {
> + read_lock(&bond->lock);
> + write_lock_bh(&bond->curr_slave_lock);
> + bond_change_active_slave(bond, NULL);
> + bond_select_active_slave(bond);
> + write_unlock_bh(&bond->curr_slave_lock);
> + read_unlock(&bond->lock);
> + }
>
> err_close:
> slave_dev->priv_flags &= ~IFF_BONDING;
I've had too much coffee today, this should've been
v2 although there aren't any changes :-)
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists