ipv6: Set skb->protocol properly for local output
authorEli Cooper <elicooper@gmx.com>
Thu, 1 Dec 2016 02:05:11 +0000 (10:05 +0800)
committerBen Hutchings <ben@decadent.org.uk>
Thu, 23 Feb 2017 03:54:41 +0000 (03:54 +0000)
commit770e91712ca6bc5bc00470772e34466e09e652e7
tree5f8b825de4870602c49a1f70f7f3d05eb93b638f
parentbb8815da1627509da24850d2d2b39e981a8b223f
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: Eli Cooper <elicooper@gmx.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
[bwh: Backported to 3.16: adjust context]
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
net/ipv6/output_core.c