From: Gao Feng <gfree.w...@foxmail.com> The ip6_vti 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 vti6_destructor_free to free the mem in the destructor, and ndo_uninit func also invokes it when fail to register the vti6 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 <gfree.w...@foxmail.com> --- net/ipv6/ip6_vti.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/net/ipv6/ip6_vti.c b/net/ipv6/ip6_vti.c index 3d8a3b6..3b3f49a 100644 --- a/net/ipv6/ip6_vti.c +++ b/net/ipv6/ip6_vti.c @@ -177,9 +177,14 @@ struct vti6_net { } } -static void vti6_dev_free(struct net_device *dev) +static void vti6_destructor_free(struct net_device *dev) { free_percpu(dev->tstats); +} + +static void vti6_dev_free(struct net_device *dev) +{ + vti6_destructor_free(dev); free_netdev(dev); } @@ -296,6 +301,10 @@ static void vti6_dev_uninit(struct net_device *dev) else vti6_tnl_unlink(ip6n, t); dev_put(dev); + + /* dev is not registered, perform the free instead of destructor */ + if (dev->reg_state == NETREG_UNINITIALIZED) + vti6_destructor_free(dev); } static int vti6_rcv(struct sk_buff *skb) -- 1.9.1