diff options
| author | Eric Dumazet <edumazet@google.com> | 2013-02-19 13:14:10 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-02-20 04:24:04 +0100 |
| commit | 4aa896c4baaab2b4f499c7434f85457f9f3d9fe4 (patch) | |
| tree | ef757028d21d1313686e7ebc309ff445f549cd82 /net/ipv4/ip_gre.c | |
| parent | ppp: set qdisc_tx_busylock to avoid LOCKDEP splat (diff) | |
| download | linux-4aa896c4baaab2b4f499c7434f85457f9f3d9fe4.tar.xz linux-4aa896c4baaab2b4f499c7434f85457f9f3d9fe4.zip | |
ip_gre: remove an extra dst_release()
commit 68c331631143 (v4 GRE: Add TCP segmentation offload for GRE)
introduced a bug in error path.
dst is attached to skb, so will be released when skb is freed.
Signed-off-by: Eric Dumazet <edumazet@google.com>
Cc: Pravin B Shelar <pshelar@nicira.com>
Acked-by: Pravin B Shelar <pshelar@nicira.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to '')
| -rw-r--r-- | net/ipv4/ip_gre.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c index 31bc94152693..5ef4da780ac1 100644 --- a/net/ipv4/ip_gre.c +++ b/net/ipv4/ip_gre.c @@ -1006,10 +1006,8 @@ static netdev_tx_t ipgre_tunnel_xmit(struct sk_buff *skb, struct net_device *dev if (skb_has_shared_frag(skb)) { err = __skb_linearize(skb); - if (err) { - ip_rt_put(rt); + if (err) goto tx_error; - } } *ptr = 0; |