* [Patch net] vti: remove duplicated code to fix a memory leak
@ 2013-06-29 5:00 Cong Wang
2013-06-29 5:18 ` Stephen Hemminger
0 siblings, 1 reply; 3+ messages in thread
From: Cong Wang @ 2013-06-29 5:00 UTC (permalink / raw)
To: netdev; +Cc: Stephen Hemminger, Saurabh Mohan, David S. Miller, Cong Wang
From: Cong Wang <amwang@redhat.com>
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>
---
diff --git a/net/ipv4/ip_vti.c b/net/ipv4/ip_vti.c
index c118f6b..17cc0ff 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;
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [Patch net] vti: remove duplicated code to fix a memory leak
2013-06-29 5:00 [Patch net] vti: remove duplicated code to fix a memory leak Cong Wang
@ 2013-06-29 5:18 ` Stephen Hemminger
2013-06-29 6:20 ` Cong Wang
0 siblings, 1 reply; 3+ messages in thread
From: Stephen Hemminger @ 2013-06-29 5:18 UTC (permalink / raw)
To: Cong Wang; +Cc: netdev, Saurabh Mohan, David S. Miller
On Sat, 29 Jun 2013 13:00:57 +0800
Cong Wang <amwang@redhat.com> wrote:
> From: Cong Wang <amwang@redhat.com>
>
> 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>
>
> ---
> diff --git a/net/ipv4/ip_vti.c b/net/ipv4/ip_vti.c
> index c118f6b..17cc0ff 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;
The fix looks correct, looks like an oversight when the generic tunnel infratructure
was added.
Acked-by: Stephen Hemminger <stephen@networkplumber.org>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2013-06-29 6:20 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-06-29 5:00 [Patch net] vti: remove duplicated code to fix a memory leak Cong Wang
2013-06-29 5:18 ` Stephen Hemminger
2013-06-29 6:20 ` Cong Wang
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).