Received: by 2002:a5b:505:0:0:0:0:0 with SMTP id o5csp7276231ybp; Wed, 16 Oct 2019 06:29:51 -0700 (PDT) X-Google-Smtp-Source: APXvYqyR9bNhguTjImRIHBAxxUfd9l9xXguizPTF7HgTRL/ZuvospixC1YIYNihDix8gNl9GToC1 X-Received: by 2002:a05:6402:3c5:: with SMTP id t5mr38379324edw.125.1571232591100; Wed, 16 Oct 2019 06:29:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1571232591; cv=none; d=google.com; s=arc-20160816; b=JxhXyivXVlC9uJmwMTAGNqcOy9Wp6rw2+n8ijaYY2lu+2jex8BJvKnCsKN4LhNAbgx 4bte0zv971PrKEwauO33lFguU4A59p175ceCerzbD/YOvCQHSl3wJ+2uepzc6VAqKP3S G09TY0qAKlqb4uCzsrIJpNeJeGt1xKjn19sBZ/0FWVWbgUadurv50GOIrwEChQoZRyxs 4S21FZ8LLMjxya5+3zdY95mycmlkSt8WUp3Z2bbD4rXzXTZGdNord/oFV7zzERUJFFbT vwwi8x+0zCMkCI037vlMUkS79vS2E7W275U8oQHKpbFMP0Si9o3xMVrAIpijHIp0WSmh 1b3A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:message-id:date:subject:cc :to:from; bh=CxS9ZSY88zvE8/vx1zYzhYHGVQcYIPixQWi2yOpRorc=; b=c9ytjAwvBxQz3GG82OYKQxQVZ7Qym0Mu8o1yDRb0yWkmUryMHm5RLbKHgu9gDzSPWV Qg0IuCJJWDSBa/6a+dcGyL+ZpRBak1amnmx2hi1nODByPdRE+MCgK/si8H9TtIakN/Wl DuNe9rsmnloAW/8t4AN1wOnF29fIeWowEqyF7IKUxFfb6VLAHMLMkPC5yyaqEuuR6FEo PZ6zPMEDdTgaiVgzTzYB5772CuWXKz5CmHzpCwjqgOSIlPTB7JZZcj6UGYbq1Tl/RIQn pEB+SY2k/qNaqUUOkDvO3o+bl/UrAGoqoXBl5UgtpG9JCTbUT+xQeNaLOyEQ4CLAHXqn 2khQ== ARC-Authentication-Results: i=1; mx.google.com; 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; dmarc=fail (p=QUARANTINE sp=NONE dis=NONE) header.from=vmware.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id gz11si15789745ejb.341.2019.10.16.06.29.27; Wed, 16 Oct 2019 06:29:51 -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; 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; dmarc=fail (p=QUARANTINE sp=NONE dis=NONE) header.from=vmware.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2391889AbfJPJJZ (ORCPT + 99 others); Wed, 16 Oct 2019 05:09:25 -0400 Received: from ex13-edg-ou-001.vmware.com ([208.91.0.189]:24354 "EHLO EX13-EDG-OU-001.vmware.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388342AbfJPJJZ (ORCPT ); Wed, 16 Oct 2019 05:09:25 -0400 Received: from sc9-mailhost2.vmware.com (10.113.161.72) by EX13-EDG-OU-001.vmware.com (10.113.208.155) with Microsoft SMTP Server id 15.0.1156.6; Wed, 16 Oct 2019 02:09:21 -0700 Received: from akaher-virtual-machine.eng.vmware.com (unknown [10.197.103.239]) by sc9-mailhost2.vmware.com (Postfix) with ESMTP id 66AE5B2609; Wed, 16 Oct 2019 05:09:23 -0400 (EDT) From: Ajay Kaher To: CC: , , , , , , , , , , , , , , , , , Mao Wenan Subject: [PATCH 4.9.y] Revert "net: sit: fix memory leak in sit_init_net()" Date: Wed, 16 Oct 2019 14:33:54 +0530 Message-ID: <1571216634-44834-1-git-send-email-akaher@vmware.com> X-Mailer: git-send-email 2.7.4 MIME-Version: 1.0 Content-Type: text/plain Received-SPF: None (EX13-EDG-OU-001.vmware.com: akaher@vmware.com does not designate permitted sender hosts) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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