Revert "net: sit: fix memory leak in sit_init_net()"
authorAjay Kaher <akaher@vmware.com>
Wed, 16 Oct 2019 09:03:54 +0000 (14:33 +0530)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 29 Oct 2019 08:15:26 +0000 (09:15 +0100)
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>
net/ipv6/sit.c

index 47ca2a2f1cf88641025829631f0775ba8e2c15b5..16eba7b5f1a9db64d8c505dddaf811861a929427 100644 (file)
@@ -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;
 }