Revert "net: sit: fix memory leak in sit_init_net()"
Subsystems (3)
PATCH 1/1 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().
--- net/ipv6/sit.c | 1 - 1 file changed, 1 deletion(-)
net/ipv6/sit.c +0 -1
@@ -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; }
Signature · 1 line
2.7.4
Greg KH
maintainerQuoted 30 lines · Ajay Kaher
This reverts commit
375d6d454a95ebacb9c6eb0b715da05a4458ffefwhich is commit07f12b26e21ab359261bf75cfcb424fdc7daeb6dupstream.Unnecessarily calling
free_netdev()fromsit_init_net().ipip6_dev_free()of 4.9.y calledfree_netdev(), so no need to call again afteripip6_dev_free().Cc Mao Wenan <[email protected]>Cc David S. Miller <[email protected]>Cc Greg Kroah-Hartman <[email protected]>Signed-off-by Ajay Kaher <[email protected]>--- net/ipv6/sit.c | 1 - 1 file changed, 1 deletion(-)net/ipv6/sit.c +0
-1@@ -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; }Signature · 1 line
2.7.4
Mao, are you ok with this change?
thanks,
greg k-h
maowenan
Reviewed-byQuoted 34 lines · Greg KH
Quoted 30 lines · Ajay Kaher
This reverts commit
375d6d454a95ebacb9c6eb0b715da05a4458ffefwhich is commit07f12b26e21ab359261bf75cfcb424fdc7daeb6dupstream.Unnecessarily calling
free_netdev()fromsit_init_net().ipip6_dev_free()of 4.9.y calledfree_netdev(), so no need to call again afteripip6_dev_free().Cc Mao Wenan <[email protected]>Cc David S. Miller <[email protected]>Cc Greg Kroah-Hartman <[email protected]>Signed-off-by Ajay Kaher <[email protected]>--- net/ipv6/sit.c | 1 - 1 file changed, 1 deletion(-)net/ipv6/sit.c +0
-1@@ -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; }Signature · 1 line
2.7.4Mao, are you ok with this change?
Quoted 4 lines
thanks,
greg k-h
Greg, ipip6_dev_free has already called free_netdev in stable 4.9.
Quoted 2 lines
.
Greg KH
maintainerQuoted 37 lines · maowenan
Quoted 34 lines · Greg KH
Quoted 30 lines · Ajay Kaher
This reverts commit
375d6d454a95ebacb9c6eb0b715da05a4458ffefwhich is commit07f12b26e21ab359261bf75cfcb424fdc7daeb6dupstream.Unnecessarily calling
free_netdev()fromsit_init_net().ipip6_dev_free()of 4.9.y calledfree_netdev(), so no need to call again afteripip6_dev_free().Cc Mao Wenan <[email protected]>Cc David S. Miller <[email protected]>Cc Greg Kroah-Hartman <[email protected]>Signed-off-by Ajay Kaher <[email protected]>--- net/ipv6/sit.c | 1 - 1 file changed, 1 deletion(-)net/ipv6/sit.c +0
-1@@ -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; }Signature · 1 line
2.7.4Mao, are you ok with this change?
Quoted 8 lines
Quoted 4 lines
thanks,
greg k-h
Greg,
ipip6_dev_freehas already calledfree_netdevin stable 4.9.Reviewed-by Mao Wenan <[email protected]>
Thanks, now queued up.
greg k-h