From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 81288C282CE for ; Wed, 24 Apr 2019 17:14:49 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 51D1921900 for ; Wed, 24 Apr 2019 17:14:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1556126089; bh=CO+Fjam87g0jwVDOPDbtilyalx+JJlz9OvyNFOWDejw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=gUmfdDy6XF/gj7XstA5p0wLW2YZBC8lamdA3CGvQd9GaBiAUlDWbcA3QkkUHMCcLU MuYuckuUfOvNM24GXyAz929oc5NOPwA5k14QePPFIRhYjNw5PoL3OKLE6eecxYFTqK 4ClCr9oe3diOJCZtaunEGmML2qHcker5De6n7KwI= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388119AbfDXROr (ORCPT ); Wed, 24 Apr 2019 13:14:47 -0400 Received: from mail.kernel.org ([198.145.29.99]:39004 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388115AbfDXROr (ORCPT ); Wed, 24 Apr 2019 13:14:47 -0400 Received: from localhost (62-193-50-229.as16211.net [62.193.50.229]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id D16CD21900; Wed, 24 Apr 2019 17:14:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1556126086; bh=CO+Fjam87g0jwVDOPDbtilyalx+JJlz9OvyNFOWDejw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=0O0vJOI9oP8V4CfizkDg+bSgQXx8rzTTGJPbfYhauhDe4/QBMiEQ13e5AnK3wMLJa VWTE1HbAla40y364JXf5I29BfJpITg1/ls638zIgZe5AmyNgXSqJN5Z38uTNNz7dvl cwpL8LeI3HlOgLo32/NonT4VOubO0mpNA2rPRq3c= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Sabrina Dubroca , "David S. Miller" Subject: [PATCH 3.18 090/104] bonding: fix event handling for stacked bonds Date: Wed, 24 Apr 2019 19:09:47 +0200 Message-Id: <20190424170909.092548995@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190424170839.996641496@linuxfoundation.org> References: <20190424170839.996641496@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Sabrina Dubroca [ Upstream commit 92480b3977fd3884649d404cbbaf839b70035699 ] When a bond is enslaved to another bond, bond_netdev_event() only handles the event as if the bond is a master, and skips treating the bond as a slave. This leads to a refcount leak on the slave, since we don't remove the adjacency to its master and the master holds a reference on the slave. Reproducer: ip link add bondL type bond ip link add bondU type bond ip link set bondL master bondU ip link del bondL No "Fixes:" tag, this code is older than git history. Signed-off-by: Sabrina Dubroca Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- drivers/net/bonding/bond_main.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) --- a/drivers/net/bonding/bond_main.c +++ b/drivers/net/bonding/bond_main.c @@ -2958,8 +2958,12 @@ static int bond_netdev_event(struct noti return NOTIFY_DONE; if (event_dev->flags & IFF_MASTER) { + int ret; + netdev_dbg(event_dev, "IFF_MASTER\n"); - return bond_master_netdev_event(event, event_dev); + ret = bond_master_netdev_event(event, event_dev); + if (ret != NOTIFY_DONE) + return ret; } if (event_dev->flags & IFF_SLAVE) {