From patchwork Tue May 2 13:34:37 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gao Feng X-Patchwork-Id: 757593 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3wHMkQ26n7z9s7B for ; Tue, 2 May 2017 23:35:58 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=foxmail.com header.i=@foxmail.com header.b="b+7L2CQy"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751160AbdEBNfz (ORCPT ); Tue, 2 May 2017 09:35:55 -0400 Received: from smtpbg298.qq.com ([184.105.67.102]:47101 "EHLO smtpbg298.qq.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750955AbdEBNfy (ORCPT ); Tue, 2 May 2017 09:35:54 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1493732091; bh=Eyg4XHRYcSQ0qhB6cbdjCQaUzTjoOhPTa2+9KC0D/GQ=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References; b=b+7L2CQySSyXS6fVUi+IzIQTkrCoRYM9yZP+1pvt71VIdrcXWYauuVt7TgDWptgRn W+2Him86DQeGP3mFJFY8osOFXtsaLYz7ils6WgCxO9v16nHn2gwNWNpD3H9xEMD2Td 3lSesGjQulEJ/3zA3EDSs4uGREVNEF+LVfNnu8Cg= X-QQ-mid: esmtp12t1493732086ti5nu8qmk Received: from ikuai-dev.ikuai8.com (unknown [123.56.230.35]) by esmtp4.qq.com (ESMTP) with id ; Tue, 02 May 2017 21:34:39 +0800 (CST) X-QQ-SSF: C1000000000000F0FI700000000000Q X-QQ-FEAT: UtFeP4UTPIdogLZm3P4NotWJcGjAzmhiIPZpQ5dzmsMCexX4+gv8J2R5vOp2M VU7Z/LTcL0Dx03dGXRZwdahAMR7W6scD3nKvjjEJoR9iLG3yNint1QTC5IjgRmDSfqqtsCl 3a3kBNITVHaeJ2qXDWXaASvdVeBE9CrzEn8Ru6pXxyBkY5y/dKzrARLqaMthEDd/FyhvCS0 Gw3OivuAEDLlJnh128TbqFfwyyDwOu2BJnnHCc3jM8fEdOvNEPwNit82ZGI5TkEZV1XPR3t 6AhjAJyZXVfa7J X-QQ-GoodBg: 0 From: gfree.wind@foxmail.com To: davem@davemloft.net, jiri@resnulli.us, mareklindner@neomailbox.ch, sw@simonwunderlich.de, a@unstable.cc, kuznet@ms2.inr.ac.ru, jmorris@namei.org, yoshfuji@linux-ipv6.org, kaber@trash.net, steffen.klassert@secunet.com, herbert@gondor.apana.org.au, netdev@vger.kernel.org Cc: Gao Feng Subject: [PATCH net v4 08/12] net: ip6_vti: Fix one possbile memleak when fail to register_netdevice Date: Tue, 2 May 2017 21:34:37 +0800 Message-Id: X-Mailer: git-send-email 1.9.1 In-Reply-To: References: X-QQ-SENDSIZE: 520 X-QQ-FName: C62C3159631F44D1B5530DB17AA882F4 X-QQ-LocalIP: 10.130.87.152 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Gao Feng The ip6_vti allocates some resources in its ndo_init func, and free some of them in its destructor func. Then there is one memleak that some errors happen after register_netdevice invokes the ndo_init callback. Because only the ndo_uninit callback is invoked in the error handler of register_netdevice, but destructor not. Now create one new func vti6_destructor_free to free the mem in the destructor, and ndo_uninit func also invokes it when fail to register the vti6 device. It's not only free all resources, but also follow the original desgin that the resources are freed in the destructor normally after register the device successfully. Signed-off-by: Gao Feng --- net/ipv6/ip6_vti.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/net/ipv6/ip6_vti.c b/net/ipv6/ip6_vti.c index 3d8a3b6..3b3f49a 100644 --- a/net/ipv6/ip6_vti.c +++ b/net/ipv6/ip6_vti.c @@ -177,9 +177,14 @@ struct vti6_net { } } -static void vti6_dev_free(struct net_device *dev) +static void vti6_destructor_free(struct net_device *dev) { free_percpu(dev->tstats); +} + +static void vti6_dev_free(struct net_device *dev) +{ + vti6_destructor_free(dev); free_netdev(dev); } @@ -296,6 +301,10 @@ static void vti6_dev_uninit(struct net_device *dev) else vti6_tnl_unlink(ip6n, t); dev_put(dev); + + /* dev is not registered, perform the free instead of destructor */ + if (dev->reg_state == NETREG_UNINITIALIZED) + vti6_destructor_free(dev); } static int vti6_rcv(struct sk_buff *skb)