summaryrefslogtreecommitdiff
path: root/net/ipv6
diff options
context:
space:
mode:
authorAjay Kaher <akaher@vmware.com>2019-10-16 14:33:54 +0530
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-10-29 09:15:26 +0100
commit45156a8303266fe29375e677713522cb1ab99fa5 (patch)
tree94d6b972511295e3562f3543944f13958a164e96 /net/ipv6
parent1ee3376d779f35f29fd3757be41a0a16e83bdd95 (diff)
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>
Diffstat (limited to 'net/ipv6')
-rw-r--r--net/ipv6/sit.c1
1 files changed, 0 insertions, 1 deletions
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;
}