Received: by 2002:a25:d7c1:0:0:0:0:0 with SMTP id o184csp2240594ybg; Sun, 27 Oct 2019 14:10:21 -0700 (PDT) X-Google-Smtp-Source: APXvYqzh/PfbKAlv+FWyla+AtIPJHWySbu0x/mM3fBitmLZyJ9FZSjpts0F4P2pZxV2dGGfLRT1m X-Received: by 2002:aa7:c358:: with SMTP id j24mr16503488edr.147.1572210620998; Sun, 27 Oct 2019 14:10:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1572210620; cv=none; d=google.com; s=arc-20160816; b=rDQZfz0LyOTgaugAR6/sqV3ceo4JNFazeVYO9oSGt6Pmy2ISFqSYh2YwqiTTXkCAl7 hkOuLM7GWb3vKtubQIxmhnx1xf7xoGn6yKgh5n5Zr0Oo1wWHTrLKpw+a8YG4C4EohHNJ kh3PDvEGh4k6grcqLufKOrHICBSya848uFHfoS2pwDD/bPiFYYNCUsnr8NNhHGCZl8Te yDKoaoPA6JmrblGtLWr9Jv7WE4eKYq45mVWjQPIB36L/RIuRsnbaMwpjrREdik8P5fd2 jDUNxhxDgbvgJdi9AmJFBSXrFDcRa1XJdsVpmg0kglUOT4SFhhQZ1aoSKJOK2VWNz3Pn mKUA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=c4rFhigE2/62smhrFrKsB6qyq27NZPiLeX5xKmOsU10=; b=HpUMo5GK/T0gm3Q67O22MsxyJYdjuvKSvt4ucixKAKTAMCJn2ENwM9XtLhFvez/dUK rj+y7zO/bRYH+MBmKT2bubUxGDb5oyXcNkNLYfqpg2mRW+QGomNSm6+RJmDsGb3w33Sb buluw0TniHrZtq9+svJcXqjAtdHIlqIUBxm9sNOLBSuFYleW4HZbYlGnP956S1aAI0rK ijNRXjvzwv98GhJ2cayW73xbJgpCo3n6ei7u7uueonESdcHWPFEhHDXQwVZXW8w9O02Q v3LzYpgnDaAUsA7+t+YwLgyyl0xO0qKrAvBy5DVwXo1eq6ILLzD2DAvlrfJik/tdh0PG n9Fg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=lnilNyyz; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id h90si6382896edd.178.2019.10.27.14.09.57; Sun, 27 Oct 2019 14:10:20 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=lnilNyyz; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727835AbfJ0VGa (ORCPT + 99 others); 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; }