lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ipv6/ip6_gre: fix error case handling in ip6gre_tunnel_xmit()

Browse Source 
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@gmail.com>
Acked-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Tommi Rantala
2013-02-06 03:24:02 +00:00
committed by David S. Miller
parent 6731d2095b
commit 41ab3e31bd
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
net/ipv6/ip6_gre.c
View File

@ -960,7 +960,7 @@ static netdev_tx_t ip6gre_tunnel_xmit(struct sk_buff *skb,
int ret; int ret;
if (!ip6_tnl_xmit_ctl(t)) if (!ip6_tnl_xmit_ctl(t))
return -1; goto tx_err;
switch (skb->protocol) { switch (skb->protocol) {
case htons(ETH_P_IP): case htons(ETH_P_IP):