Commit b4e479a9 authored Dec 01, 2016 by Eli Cooper Committed by David S. Miller Dec 02, 2016

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.

Cc: stable@vger.kernel.org
Signed-off-by: Eli Cooper <elicooper@gmx.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent f4180439

net/ipv6/output_core.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -155,6 +155,8 @@ int __ip6_local_out(struct net net, struct sock sk, struct sk_buff *skb)
		if (unlikely(!skb))
		return 0;

		skb->protocol = htons(ETH_P_IPV6);

		return nf_hook(NFPROTO_IPV6, NF_INET_LOCAL_OUT,
		net, sk, skb, NULL, skb_dst(skb)->dev,
		dst_output);

Admin message