diff options
| author | Eli Cooper <elicooper@gmx.com> | 2016-12-01 10:05:10 +0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-12-10 19:09:44 +0100 |
| commit | 686182870c6a7dce62c432aeba4aaedd113322e7 (patch) | |
| tree | c36ec6a88d57d2db6b678e64dcbc7ada9486b34b | |
| parent | e67bd82fb79d04426f8f5f8bc52c31e9fbb8b69d (diff) | |
ipv4: Set skb->protocol properly for local output
commit f4180439109aa720774baafdd798b3234ab1a0d2 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_IP before dst_output() is called,
fixing a bug where GSO packets sent through a sit tunnel are dropped
when xfrm is involved.
Signed-off-by: Eli Cooper <elicooper@gmx.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | net/ipv4/ip_output.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/net/ipv4/ip_output.c b/net/ipv4/ip_output.c index 307daed9a4b9..f4790c30c543 100644 --- a/net/ipv4/ip_output.c +++ b/net/ipv4/ip_output.c @@ -98,6 +98,9 @@ int __ip_local_out(struct net *net, struct sock *sk, struct sk_buff *skb) iph->tot_len = htons(skb->len); ip_send_check(iph); + + skb->protocol = htons(ETH_P_IP); + return nf_hook(NFPROTO_IPV4, NF_INET_LOCAL_OUT, net, sk, skb, NULL, skb_dst(skb)->dev, dst_output); |