netdev - Re: [Patch net] vti: remove duplicated code to fix a memory leak

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date:	Fri, 28 Jun 2013 22:18:49 -0700
From:	Stephen Hemminger <stephen@...workplumber.org>
To:	Cong Wang <amwang@...hat.com>
Cc:	netdev@...r.kernel.org, Saurabh Mohan <saurabh.mohan@...tta.com>,
	"David S. Miller" <davem@...emloft.net>
Subject: Re: [Patch net] vti: remove duplicated code to fix a memory leak

On Sat, 29 Jun 2013 13:00:57 +0800
Cong Wang <amwang@...hat.com> wrote:

> From: Cong Wang <amwang@...hat.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@...workplumber.org>
> Cc: Saurabh Mohan <saurabh.mohan@...tta.com>
> Cc: "David S. Miller" <davem@...emloft.net>
> Signed-off-by: Cong Wang <amwang@...hat.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@...workplumber.org>
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html