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=-8.2 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=unavailable 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 39C9BCA9EBC for ; Sun, 27 Oct 2019 20:05:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0D0BE208C0 for ; Sun, 27 Oct 2019 20:05:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1572206754; bh=CUyR3fuoRdKrJf9nZf1t8S4z237j7l+D00ncfqIoSsU=; h=Date:From:To:Cc:Subject:References:In-Reply-To:List-ID:From; b=2G48QzsLxixSLlGoX2Ks6E4iUZ4gDl788GZL0FnE/4wmQiB/m5dYDjuYrNAT6zPfH SIp2pm9gGRT1s30jNIlwuTul+k9DGxkMdLuabPrfEIdreij/r+K1Q0WBrG2F4sB8O8 p0YfO5CfHX5EDR2OvlcA2xXaeH/zQ2FcdIxX1TZo= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727639AbfJ0UFv (ORCPT ); Sun, 27 Oct 2019 16:05:51 -0400 Received: from mail.kernel.org ([198.145.29.99]:43522 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727235AbfJ0UFv (ORCPT ); Sun, 27 Oct 2019 16:05:51 -0400 Received: from localhost (100.50.158.77.rev.sfr.net [77.158.50.100]) (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 7B71E2070B; Sun, 27 Oct 2019 20:05:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1572206750; bh=CUyR3fuoRdKrJf9nZf1t8S4z237j7l+D00ncfqIoSsU=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=agxvakRkTOgijn/qKghHaoBmSxLV42tfG+3mDaEYBQaWHZAkmKod8SYfXy4MpEWo6 Dprkv23dHk6aJ3UmcpP4M8lhhTvS7xXEaYUcPvmJap/tZyHGkHa2Inqt5Kicypqv4d meAoiKQjcdHD9W3YcUkXv7dyo7Dh3OrLSJTGPLUs= Date: Sun, 27 Oct 2019 21:05:47 +0100 From: Greg KH To: maowenan Cc: Ajay Kaher , davem@davemloft.net, kuznet@ms2.inr.ac.ru, jmorris@namei.org, yoshfuji@linux-ipv6.org, kaber@trash.net, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, stable@vger.kernel.org, srivatsab@vmware.com, srivatsa@csail.mit.edu, amakhalov@vmware.com, srinidhir@vmware.com, bvikas@vmware.com, anishs@vmware.com, vsirnapalli@vmware.com, srostedt@vmware.com Subject: Re: [PATCH 4.9.y] Revert "net: sit: fix memory leak in sit_init_net()" Message-ID: <20191027200547.GB2588299@kroah.com> References: <1571216634-44834-1-git-send-email-akaher@vmware.com> <20191016183027.GC801860@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.12.2 (2019-09-21) Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org On Fri, Oct 18, 2019 at 09:48:05AM +0800, maowenan wrote: > > > On 2019/10/17 2:30, Greg KH wrote: > > On Wed, Oct 16, 2019 at 02:33:54PM +0530, Ajay Kaher wrote: > >> This reverts commit 375d6d454a95ebacb9c6eb0b715da05a4458ffef which is > >> commit 07f12b26e21ab359261bf75cfcb424fdc7daeb6d upstream. > >> > >> Unnecessarily calling free_netdev() from sit_init_net(). > >> ipip6_dev_free() of 4.9.y called free_netdev(), so no need > >> to call again after ipip6_dev_free(). > >> > >> Cc: Mao Wenan > >> Cc: David S. Miller > >> Cc: Greg Kroah-Hartman > >> Signed-off-by: Ajay Kaher > >> --- > >> net/ipv6/sit.c | 1 - > >> 1 file changed, 1 deletion(-) > >> > >> diff --git a/net/ipv6/sit.c b/net/ipv6/sit.c > >> index 47ca2a2..16eba7b 100644 > >> --- a/net/ipv6/sit.c > >> +++ b/net/ipv6/sit.c > >> @@ -1856,7 +1856,6 @@ static int __net_init sit_init_net(struct net *net) > >> > >> err_reg_dev: > >> ipip6_dev_free(sitn->fb_tunnel_dev); > >> - free_netdev(sitn->fb_tunnel_dev); > >> err_alloc_dev: > >> return err; > >> } > >> -- > >> 2.7.4 > >> > > > > Mao, are you ok with this change? > > > > thanks, > > > > greg k-h > > > > Greg, ipip6_dev_free has already called free_netdev in stable 4.9. > > Reviewed-by: Mao Wenan Thanks, now queued up. greg k-h