From: Ajay Kaher <akaher@vmware.com>
Date: Wed, 16 Oct 2019 09:03:54 +0000 (+0530)
Subject: Revert "net: sit: fix memory leak in sit_init_net()"
X-Git-Tag: v4.9.198~2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=45156a8303266fe29375e677713522cb1ab99fa5;p=platform%2Fkernel%2Flinux-amlogic.git

Revert "net: sit: fix memory leak in sit_init_net()"

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>
Signed-off-by: Ajay Kaher <akaher@vmware.com>
Reviewed-by: Mao Wenan <maowenan@huawei.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/net/ipv6/sit.c b/net/ipv6/sit.c
index 47ca2a2f1cf8..16eba7b5f1a9 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;
 }