diff options
| author | Cong Wang <amwang@redhat.com> | 2013-06-29 13:00:57 +0800 |
|---|---|---|
| committer | Steven Rostedt <rostedt@goodmis.org> | 2013-09-11 00:16:57 -0400 |
| commit | 1359f33851ec3562a56d20fea047edc941d003c8 (patch) | |
| tree | ced94dc11c3b8ecd0b2779ab5bc0d6dc55949912 /net | |
| parent | b1228fd51f2e4f76af3f7290743df3f8ffce02db (diff) | |
vti: remove duplicated code to fix a memory leak
[ Upstream commit ab6c7a0a43c2eaafa57583822b619b22637b49c7 ]
vti module allocates dev->tstats twice: in vti_fb_tunnel_init()
and in vti_tunnel_init(), this lead to a memory leak of
dev->tstats.
Just remove the duplicated operations in vti_fb_tunnel_init().
(candidate for -stable)
Cc: Stephen Hemminger <stephen@networkplumber.org>
Cc: Saurabh Mohan <saurabh.mohan@vyatta.com>
Cc: "David S. Miller" <davem@davemloft.net>
Signed-off-by: Cong Wang <amwang@redhat.com>
Acked-by: Stephen Hemminger <stephen@networkplumber.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
Diffstat (limited to 'net')
| -rw-r--r-- | net/ipv4/ip_vti.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/net/ipv4/ip_vti.c b/net/ipv4/ip_vti.c index bf89b21d22d0..ab37b319269a 100644 --- a/net/ipv4/ip_vti.c +++ b/net/ipv4/ip_vti.c @@ -664,17 +664,10 @@ static int __net_init vti_fb_tunnel_init(struct net_device *dev) struct iphdr *iph = &tunnel->parms.iph; struct vti_net *ipn = net_generic(dev_net(dev), vti_net_id); - tunnel->dev = dev; - strcpy(tunnel->parms.name, dev->name); - iph->version = 4; iph->protocol = IPPROTO_IPIP; iph->ihl = 5; - dev->tstats = alloc_percpu(struct pcpu_tstats); - if (!dev->tstats) - return -ENOMEM; - dev_hold(dev); rcu_assign_pointer(ipn->tunnels_wc[0], tunnel); return 0; |