netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Greg KH <gregkh@linuxfoundation.org>
To: maowenan <maowenan@huawei.com>
Cc: Ajay Kaher <akaher@vmware.com>,
	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()"
Date: Sun, 27 Oct 2019 21:05:47 +0100	[thread overview]
Message-ID: <20191027200547.GB2588299@kroah.com> (raw)
In-Reply-To: <d0cbd39d-9fb7-dad8-b951-12aa299f13e8@huawei.com>

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 <maowenan@huawei.com>
> >> Cc: David S. Miller <davem@davemloft.net>
> >> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> >> Signed-off-by: Ajay Kaher <akaher@vmware.com>
> >> ---
> >>  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 <maowenan@huawei.com>

Thanks, now queued up.

greg k-h

      reply	other threads:[~2019-10-27 20:05 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-10-16  9:03 [PATCH 4.9.y] Revert "net: sit: fix memory leak in sit_init_net()" Ajay Kaher
2019-10-16 18:30 ` Greg KH
2019-10-18  1:48   ` maowenan
2019-10-27 20:05     ` Greg KH [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20191027200547.GB2588299@kroah.com \
    --to=gregkh@linuxfoundation.org \
    --cc=akaher@vmware.com \
    --cc=amakhalov@vmware.com \
    --cc=anishs@vmware.com \
    --cc=bvikas@vmware.com \
    --cc=davem@davemloft.net \
    --cc=jmorris@namei.org \
    --cc=kaber@trash.net \
    --cc=kuznet@ms2.inr.ac.ru \
    --cc=linux-kernel@vger.kernel.org \
    --cc=maowenan@huawei.com \
    --cc=netdev@vger.kernel.org \
    --cc=srinidhir@vmware.com \
    --cc=srivatsa@csail.mit.edu \
    --cc=srivatsab@vmware.com \
    --cc=srostedt@vmware.com \
    --cc=stable@vger.kernel.org \
    --cc=vsirnapalli@vmware.com \
    --cc=yoshfuji@linux-ipv6.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).