aboutsummaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorCong Wang <amwang@redhat.com>2013-06-29 13:00:57 +0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-07-28 16:29:48 -0700
commitda04e7df0494a9a6ccfe2aada8a262e38c284914 (patch)
tree1a2de4bbc378c993d01adfb1b6ba97084332f1cb /net
parent3d3fa8bca30d8fd9cf5b95bd3eb9d7e2a50dec1c (diff)
downloadvexpress-lsk-da04e7df0494a9a6ccfe2aada8a262e38c284914.tar.gz
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) Signed-off-by: Cong Wang <amwang@redhat.com> Cc: Stephen Hemminger <stephen@networkplumber.org> Cc: Saurabh Mohan <saurabh.mohan@vyatta.com> Acked-by: Stephen Hemminger <stephen@networkplumber.org> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net')
-rw-r--r--net/ipv4/ip_vti.c7
1 files changed, 0 insertions, 7 deletions
diff --git a/net/ipv4/ip_vti.c b/net/ipv4/ip_vti.c
index c118f6b576b..17cc0ffa8c0 100644
--- a/net/ipv4/ip_vti.c
+++ b/net/ipv4/ip_vti.c
@@ -606,17 +606,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;