summaryrefslogtreecommitdiffstats
path: root/net/ipv4
diff options
context:
space:
mode:
authorEric Dumazet <edumazet@google.com>2013-02-19 12:14:10 +0000
committerDavid S. Miller <davem@davemloft.net>2013-02-19 22:24:04 -0500
commit4aa896c4baaab2b4f499c7434f85457f9f3d9fe4 (patch)
treeef757028d21d1313686e7ebc309ff445f549cd82 /net/ipv4
parent303c07db487be59ae9fda10600ea65ca11c21497 (diff)
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 'net/ipv4')
-rw-r--r--net/ipv4/ip_gre.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c
index 31bc9415269..5ef4da780ac 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;