From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932842AbbCQJLI (ORCPT ); Tue, 17 Mar 2015 05:11:08 -0400 Received: from ip4-83-240-67-251.cust.nbox.cz ([83.240.67.251]:59532 "EHLO ip4-83-240-18-248.cust.nbox.cz" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753259AbbCQInA (ORCPT ); Tue, 17 Mar 2015 04:43:00 -0400 From: Jiri Slaby To: stable@vger.kernel.org Cc: linux-kernel@vger.kernel.org, WANG Cong , "David S. Miller" , Jiri Slaby Subject: [PATCH 3.12 077/175] rtnetlink: call ->dellink on failure when ->newlink exists Date: Tue, 17 Mar 2015 09:40:55 +0100 Message-Id: <4e522af0f15f3c2f63b789c0a6e6008eeb8f42b3.1426581621.git.jslaby@suse.cz> X-Mailer: git-send-email 2.3.0 In-Reply-To: References: In-Reply-To: References: Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: WANG Cong 3.12-stable review patch. If anyone has any objections, please let me know. =============== [ Upstream commit 7afb8886a05be68e376655539a064ec672de8a8e ] Ignacy reported that when eth0 is down and add a vlan device on top of it like: ip link add link eth0 name eth0.1 up type vlan id 1 We will get a refcount leak: unregister_netdevice: waiting for eth0.1 to become free. Usage count = 2 The problem is when rtnl_configure_link() fails in rtnl_newlink(), we simply call unregister_device(), but for stacked device like vlan, we almost do nothing when we unregister the upper device, more work is done when we unregister the lower device, so call its ->dellink(). Reported-by: Ignacy Gawedzki Signed-off-by: Cong Wang Signed-off-by: David S. Miller Signed-off-by: Jiri Slaby --- net/core/rtnetlink.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c index d211eddb9a02..76cc27f3f991 100644 --- a/net/core/rtnetlink.c +++ b/net/core/rtnetlink.c @@ -1924,8 +1924,16 @@ replay: } err = rtnl_configure_link(dev, ifm); - if (err < 0) - unregister_netdevice(dev); + if (err < 0) { + if (ops->newlink) { + LIST_HEAD(list_kill); + + ops->dellink(dev, &list_kill); + unregister_netdevice_many(&list_kill); + } else { + unregister_netdevice(dev); + } + } out: put_net(dest_net); return err; -- 2.3.0