From: Gao Feng <[email protected]> The ip6_tunnel allocates some resources in its ndo_init func, and free some of them in its destructor func. Then there is one memleak that some errors happen after register_netdevice invokes the ndo_init callback. Because only the ndo_uninit callback is invoked in the error handler of register_netdevice, but destructor not.
Now create one new func ip6_tnl_destructor_free to free the mem in the destructor, and ndo_uninit func also invokes it when fail to register the ip6_tunnel device. It's not only free all resources, but also follow the original desgin that the resources are freed in the destructor normally after register the device successfully. Signed-off-by: Gao Feng <[email protected]> --- v3: Split one patch to multiple commits, per David Ahern v2: Move the free in ndo_uninit when fail to register, per Herbert Xu v1: initial version net/ipv6/ip6_tunnel.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/net/ipv6/ip6_tunnel.c b/net/ipv6/ip6_tunnel.c index 75fac93..1e10334 100644 --- a/net/ipv6/ip6_tunnel.c +++ b/net/ipv6/ip6_tunnel.c @@ -247,13 +247,18 @@ ip6_tnl_unlink(struct ip6_tnl_net *ip6n, struct ip6_tnl *t) } } -static void ip6_dev_free(struct net_device *dev) +static void ip6_tnl_destructor_free(struct net_device *dev) { struct ip6_tnl *t = netdev_priv(dev); gro_cells_destroy(&t->gro_cells); dst_cache_destroy(&t->dst_cache); free_percpu(dev->tstats); +} + +static void ip6_dev_free(struct net_device *dev) +{ + ip6_tnl_destructor_free(dev); free_netdev(dev); } @@ -387,6 +392,10 @@ ip6_tnl_dev_uninit(struct net_device *dev) ip6_tnl_unlink(ip6n, t); dst_cache_reset(&t->dst_cache); dev_put(dev); + + /* dev is not registered, perform the free instead of destructor */ + if (dev->reg_state == NETREG_UNINITIALIZED) + ip6_tnl_destructor_free(dev); } /** -- 2.7.4
