ipv6: Set skb->protocol properly for local output

When xfrm is applied to TSO/GSO packets, it follows this path: xfrm_output() -> xfrm_output_gso() -> skb_gso_segment() where skb_gso_segment() relies on skb->protocol to function properly. This patch sets skb->protocol to ETH_P_IPV6 before dst_output() is called, fixing a bug where GSO packets sent through an ipip6 tunnel are dropped when xfrm is involved.

Eli Cooper committed 9 years ago

Commit b4e479a1 parent f4180431 file · +2 −0Browse files

Unified · Split

net/ipv6/output_core.c+2−0

@@ -155,6 +155,8 @@ int __ip6_local_out(struct net net, struct sock sk, struct sk_buff *skb) · 154 unmodified lines
155	if (unlikely(!skb))	155	if (unlikely(!skb))
156	return 0;	156	return 0;
157		157
		158	skb->protocol = htons(ETH_P_IPV6);
		159
158	return nf_hook(NFPROTO_IPV6, NF_INET_LOCAL_OUT,	160	return nf_hook(NFPROTO_IPV6, NF_INET_LOCAL_OUT,
159	net, sk, skb, NULL, skb_dst(skb)->dev,	161	net, sk, skb, NULL, skb_dst(skb)->dev,
160	dst_output);	162	dst_output);