Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 25d8b7c1 authored by Eli Cooper's avatar Eli Cooper Committed by Greg Kroah-Hartman
Browse files

ipv6: Set skb->protocol properly for local output 



commit b4e479a96fc398ccf83bb1cffb4ffef8631beaf1 upstream.

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.

Signed-off-by: default avatarEli Cooper <elicooper@gmx.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent d41fb2fb

net/ipv6/output_core.c

+2 −0
Original line number Diff line number Diff line
@@ -148,6 +148,8 @@ int __ip6_local_out(struct net *net, struct sock *sk, struct sk_buff *skb) 
	ipv6_hdr(skb)->payload_len = htons(len);

	IP6CB(skb)->nhoff = offsetof(struct ipv6hdr, nexthdr);



	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);