Commit 5465740a authored by Pravin B Shelar's avatar Pravin B Shelar Committed by David S. Miller
Browse files

IP_GRE: Fix kernel panic in IP_GRE with GRE csum.

Due to IP_GRE GSO support, GRE can recieve non linear skb which
results in panic in case of GRE_CSUM.  Following patch fixes it by
using correct csum API.

Bug introduced in commit 6b78f16e

 (gre: add GSO support)
Signed-off-by: default avatarPravin B Shelar <pshelar@nicira.com>
Acked-by: default avatarEric Dumazet <edumazet@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 9839ff0d
...@@ -963,8 +963,12 @@ static netdev_tx_t ipgre_tunnel_xmit(struct sk_buff *skb, struct net_device *dev ...@@ -963,8 +963,12 @@ static netdev_tx_t ipgre_tunnel_xmit(struct sk_buff *skb, struct net_device *dev
ptr--; ptr--;
} }
if (tunnel->parms.o_flags&GRE_CSUM) { if (tunnel->parms.o_flags&GRE_CSUM) {
int offset = skb_transport_offset(skb);
*ptr = 0; *ptr = 0;
*(__sum16 *)ptr = ip_compute_csum((void *)(iph+1), skb->len - sizeof(struct iphdr)); *(__sum16 *)ptr = csum_fold(skb_checksum(skb, offset,
skb->len - offset,
0));
} }
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment