diff options
| author | Tommi Rantala <tt.rantala@gmail.com> | 2013-02-06 03:24:02 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-02-06 16:02:05 -0500 |
| commit | 41ab3e31bd50b42c85ac0aa0469642866aee2a9a (patch) | |
| tree | c3eb42cb9cdb497b6dd00524f4002adfa0975838 | |
| parent | 6731d2095bd4aef18027c72ef845ab1087c3ba63 (diff) | |
| download | linux-3.10-41ab3e31bd50b42c85ac0aa0469642866aee2a9a.tar.gz linux-3.10-41ab3e31bd50b42c85ac0aa0469642866aee2a9a.tar.bz2 linux-3.10-41ab3e31bd50b42c85ac0aa0469642866aee2a9a.zip | |
ipv6/ip6_gre: fix error case handling in ip6gre_tunnel_xmit()
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>
| -rw-r--r-- | net/ipv6/ip6_gre.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv6/ip6_gre.c b/net/ipv6/ip6_gre.c index c727e471275..131dd097736 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): |