From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.linuxfoundation.org ([140.211.169.12]:46929 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754869AbbKQWki (ORCPT ); Tue, 17 Nov 2015 17:40:38 -0500 Subject: Patch "bonding: fix panic on non-ARPHRD_ETHER enslave failure" has been added to the 4.2-stable tree To: jay.vosburgh@canonical.com, davem@davemloft.net, gregkh@linuxfoundation.org, nikolay@cumulusnetworks.com Cc: , From: Date: Tue, 17 Nov 2015 14:40:36 -0800 Message-ID: <144780003615593@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org List-ID: This is a note to let you know that I've just added the patch titled bonding: fix panic on non-ARPHRD_ETHER enslave failure to the 4.2-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: bonding-fix-panic-on-non-arphrd_ether-enslave-failure.patch and it can be found in the queue-4.2 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let know about it. >>From foo@baz Tue Nov 17 14:34:38 PST 2015 From: Jay Vosburgh Date: Fri, 6 Nov 2015 17:23:23 -0800 Subject: bonding: fix panic on non-ARPHRD_ETHER enslave failure From: Jay Vosburgh [ Upstream commit 40baec225765c54eefa870530dd613bad9829bb7 ] Since commit 7d5cd2ce529b, when bond_enslave fails on devices that are not ARPHRD_ETHER, if needed, it resets the bonding device back to ARPHRD_ETHER by calling ether_setup. Unfortunately, ether_setup clobbers dev->flags, clearing IFF_UP if the bond device is up, leaving it in a quasi-down state without having actually gone through dev_close. For bonding, if any periodic work queue items are active (miimon, arp_interval, etc), those will remain running, as they are stopped by bond_close. At this point, if the bonding module is unloaded or the bond is deleted, the system will panic when the work function is called. This panic is resolved by calling dev_close on the bond itself prior to calling ether_setup. Cc: Nikolay Aleksandrov Signed-off-by: Jay Vosburgh Fixes: 7d5cd2ce5292 ("bonding: correctly handle bonding type change on enslave failure") Acked-by: Nikolay Aleksandrov Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- drivers/net/bonding/bond_main.c | 1 + 1 file changed, 1 insertion(+) --- a/drivers/net/bonding/bond_main.c +++ b/drivers/net/bonding/bond_main.c @@ -1751,6 +1751,7 @@ err_undo_flags: slave_dev->dev_addr)) eth_hw_addr_random(bond_dev); if (bond_dev->type != ARPHRD_ETHER) { + dev_close(bond_dev); ether_setup(bond_dev); bond_dev->flags |= IFF_MASTER; bond_dev->priv_flags &= ~IFF_TX_SKB_SHARING; Patches currently in stable-queue which might be from jay.vosburgh@canonical.com are queue-4.2/bonding-fix-panic-on-non-arphrd_ether-enslave-failure.patch