Skip to content

Commit

Permalink
ipv6: Set skb->protocol properly for local output
Browse files Browse the repository at this point in the history
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: [email protected]
Signed-off-by: Eli Cooper <[email protected]>
Signed-off-by: David S. Miller <[email protected]>
  • Loading branch information
Eli Cooper authored and davem330 committed Dec 2, 2016
1 parent f418043 commit b4e479a
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions net/ipv6/output_core.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit b4e479a

Please sign in to comment.