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=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham 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 2A463CA9EAF for ; Sun, 27 Oct 2019 21:06:32 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E324D21726 for ; Sun, 27 Oct 2019 21:06:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1572210392; bh=08EyPMWXekNJLiSe9LQnpbcaa7A9FVw94OUmQbSszqE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=c6Gy1AdqzTFOkBz/ITZOvEazd10uGVR5JDS4MbJNQmr/bz1vzbyXsVcvkgBRzEFQy a1+X9lo0DO6G888DvKzu39lnichRBkcB54GoicK5dehK96fozD+jwIM01O0Cw7dIYj A8ZI7o4RRLlC+zrERSTv4Mr7Z7vAjKMp24QGObeE= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727887AbfJ0VGa (ORCPT ); Sun, 27 Oct 2019 17:06:30 -0400 Received: from mail.kernel.org ([198.145.29.99]:52408 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728054AbfJ0VG1 (ORCPT ); Sun, 27 Oct 2019 17:06:27 -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 743F021726; Sun, 27 Oct 2019 21:06:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1572210387; bh=08EyPMWXekNJLiSe9LQnpbcaa7A9FVw94OUmQbSszqE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=lnilNyyzoc6rMl1YiWQAdylMWqArSFffInusDRxeBbt+BwMDg//ZVPjdLly2TXtsI 3jHQbxLFOi3fV6i6MDV4k1VXP8ZSjdpL67MBsGNnuWjppWaQhJGLGISztrr76ZzwY6 SpCGCcJl1PYOZ/xTgRwzuHJDHa3FTWc37FzmA9Sw= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Mao Wenan , "David S. Miller" , Ajay Kaher Subject: [PATCH 4.9 48/49] Revert "net: sit: fix memory leak in sit_init_net()" Date: Sun, 27 Oct 2019 22:01:26 +0100 Message-Id: <20191027203207.296444377@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191027203119.468466356@linuxfoundation.org> References: <20191027203119.468466356@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Ajay Kaher 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 Signed-off-by: Ajay Kaher Reviewed-by: Mao Wenan Signed-off-by: Greg Kroah-Hartman --- net/ipv6/sit.c | 1 - 1 file changed, 1 deletion(-) --- a/net/ipv6/sit.c +++ b/net/ipv6/sit.c @@ -1856,7 +1856,6 @@ static int __net_init sit_init_net(struc err_reg_dev: ipip6_dev_free(sitn->fb_tunnel_dev); - free_netdev(sitn->fb_tunnel_dev); err_alloc_dev: return err; }