netdev - Re: [PATCH] ipv6/ip6_gre: fix error case handling in ip6gre_tunnel

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]

Message-ID: <1360157395.28557.30.camel@edumazet-glaptop>
Date:	Wed, 06 Feb 2013 05:29:55 -0800
From:	Eric Dumazet <eric.dumazet@...il.com>
To:	Tommi Rantala <tt.rantala@...il.com>
Cc:	"David S. Miller" <davem@...emloft.net>,
	Alexey Kuznetsov <kuznet@....inr.ac.ru>,
	James Morris <jmorris@...ei.org>,
	Hideaki YOSHIFUJI <yoshfuji@...ux-ipv6.org>,
	Patrick McHardy <kaber@...sh.net>, netdev@...r.kernel.org,
	Dmitry Kozlov <xeb@...l.ru>
Subject: Re: [PATCH] ipv6/ip6_gre: fix error case handling in
 ip6gre_tunnel_xmit()

On Wed, 2013-02-06 at 15:24 +0200, Tommi Rantala wrote:
> ip6gre_tunnel_xmit() is leaking the skb when we hit this error branch,
> and the -1 return value from this function is bogus. Use the error
> handling we already have in place in ip6gre_tunnel_xmit() for this error
> case to fix this.
> 
> Signed-off-by: Tommi Rantala <tt.rantala@...il.com>
> ---
>  net/ipv6/ip6_gre.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/net/ipv6/ip6_gre.c b/net/ipv6/ip6_gre.c
> index c727e47..131dd09 100644
> --- a/net/ipv6/ip6_gre.c
> +++ b/net/ipv6/ip6_gre.c
> @@ -960,7 +960,7 @@ static netdev_tx_t ip6gre_tunnel_xmit(struct sk_buff *skb,
>  	int ret;
>  
>  	if (!ip6_tnl_xmit_ctl(t))
> -		return -1;
> +		goto tx_err;
>  
>  	switch (skb->protocol) {
>  	case htons(ETH_P_IP):

Acked-by: Eric Dumazet <edumazet@...gle.com>

Thanks Tommi


--
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