aboutsummaryrefslogtreecommitdiff
path: root/net/ipv6/output_core.c
diff options
context:
space:
mode:
authorEli Cooper <elicooper@gmx.com>2016-12-01 10:05:11 +0800
committerDavid S. Miller <davem@davemloft.net>2016-12-02 12:34:22 -0500
commitb4e479a96fc398ccf83bb1cffb4ffef8631beaf1 (patch)
tree0b2053915f3aa78279cf87b8f123b17e147c2e7f /net/ipv6/output_core.c
parentf4180439109aa720774baafdd798b3234ab1a0d2 (diff)
downloadlinux-stericsson-b4e479a96fc398ccf83bb1cffb4ffef8631beaf1.tar.gz
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>
Diffstat (limited to 'net/ipv6/output_core.c')
-rw-r--r--net/ipv6/output_core.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/net/ipv6/output_core.c b/net/ipv6/output_core.c
index 7cca8ac66fe9..cd4252346a32 100644
--- a/net/ipv6/output_core.c
+++ b/net/ipv6/output_core.c
@@ -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);