[PATCH net v4 09/12] net: ip_tunnel: Fix one possbile memleak when fail to register_netdevice
From: <hidden>
Date: 2017-05-02 13:37:52
Subsystem:
networking [general], networking [ipv4/ipv6], the rest · Maintainers:
"David S. Miller", Eric Dumazet, Jakub Kicinski, Paolo Abeni, David Ahern, Ido Schimmel, Linus Torvalds
From: Gao Feng <redacted> The ip_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 ip_tunnel_destructor_free to free the mem in the destructor, and ndo_uninit func also invokes it when fail to register the ip_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 <redacted> --- net/ipv4/ip_tunnel.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/net/ipv4/ip_tunnel.c b/net/ipv4/ip_tunnel.c
index 823abae..96a3005 100644
--- a/net/ipv4/ip_tunnel.c
+++ b/net/ipv4/ip_tunnel.c@@ -954,13 +954,18 @@ int ip_tunnel_change_mtu(struct net_device *dev, int new_mtu) } EXPORT_SYMBOL_GPL(ip_tunnel_change_mtu); -static void ip_tunnel_dev_free(struct net_device *dev) +static void ip_tunnel_destructor_free(struct net_device *dev) { struct ip_tunnel *tunnel = netdev_priv(dev); gro_cells_destroy(&tunnel->gro_cells); dst_cache_destroy(&tunnel->dst_cache); free_percpu(dev->tstats); +} + +static void ip_tunnel_dev_free(struct net_device *dev) +{ + ip_tunnel_destructor_free(dev); free_netdev(dev); }
@@ -1192,6 +1197,10 @@ void ip_tunnel_uninit(struct net_device *dev) ip_tunnel_del(itn, netdev_priv(dev)); dst_cache_reset(&tunnel->dst_cache); + + /* dev is not registered, perform the free instead of destructor */ + if (dev->reg_state == NETREG_UNINITIALIZED) + ip_tunnel_destructor_free(dev); } EXPORT_SYMBOL_GPL(ip_tunnel_uninit);
--
1.9.1