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 E1D26FA372A for ; Wed, 16 Oct 2019 18:30:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C006321A49 for ; Wed, 16 Oct 2019 18:30:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1571250638; bh=YUlJQf0q4MGsg0ffIebPtBuNdy0JVjUzZ2aGCptF0K4=; h=Date:From:To:Cc:Subject:References:In-Reply-To:List-ID:From; b=IFA2SzkAIIf5SNvXcDnW7K1WrKTRW177g59mNYE3IjR7LXH2jeBcubt38LgGfAlbR A3Sk1afEt+vo3/RUjamMvPPMfDbJSuYyUxgdShBFGQ4XAmC/SsC6WTl7R0edyeqKpt 5HWf9qODz9Td8/HVZrCDuNsU1DEn3LQRnI9qdVcc= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2391065AbfJPSad (ORCPT ); Wed, 16 Oct 2019 14:30:33 -0400 Received: from mail.kernel.org ([198.145.29.99]:60046 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2390895AbfJPSac (ORCPT ); Wed, 16 Oct 2019 14:30:32 -0400 Received: from localhost (li1825-44.members.linode.com [172.104.248.44]) (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 4EA51218DE; Wed, 16 Oct 2019 18:30:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1571250632; bh=YUlJQf0q4MGsg0ffIebPtBuNdy0JVjUzZ2aGCptF0K4=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=xvc9zM+ubcObecxlfk5icYjHF6LLmgLlDLGVbaKMmFMMqOJ0Hw7/qpsiqFGtLuH57 fDKzJPozfQTkV+yFhjU5FpeH6wFe+DRmCi61olJom9W/tUTVmuWunfhxjC4PiAwW6q WnRK6/uJNmIk3Z5TVZiBi6oznIzLHMTeaIGdcPdA= Date: Wed, 16 Oct 2019 11:30:27 -0700 From: Greg KH To: Ajay Kaher , Mao Wenan Cc: 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, Mao Wenan Subject: Re: [PATCH 4.9.y] Revert "net: sit: fix memory leak in sit_init_net()" Message-ID: <20191016183027.GC801860@kroah.com> References: <1571216634-44834-1-git-send-email-akaher@vmware.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1571216634-44834-1-git-send-email-akaher@vmware.com> User-Agent: Mutt/1.12.2 (2019-09-21) Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org 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