diff options
| author |   Eli Cooper <elicooper@gmx.com> | 2016-12-01 10:05:10 +0800 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2016-12-02 12:34:22 -0500 |
| commit | f4180439109aa720774baafdd798b3234ab1a0d2 (patch) | |
| tree | 03c8f7784d5e833ef1a917299da4d2a80573e781 /net/ipv4/ip_output.c | |
| parent | packet: fix race condition in packet_set_ring (diff) | |
| download | linux-dev-f4180439109aa720774baafdd798b3234ab1a0d2.tar.xz linux-dev-f4180439109aa720774baafdd798b3234ab1a0d2.zip | |
ipv4: 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_IP before dst_output() is called,
fixing a bug where GSO packets sent through a sit 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/ipv4/ip_output.c')
| -rw-r--r-- | net/ipv4/ip_output.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/ipv4/ip_output.c b/net/ipv4/ip_output.c index 105908d841a3..877bdb02e887 100644 --- a/net/ipv4/ip_output.c +++ b/net/ipv4/ip_output.c @@ -107,6 +107,8 @@ int __ip_local_out(struct net *net, struct sock *sk, struct sk_buff *skb) if (unlikely(!skb)) return 0; + 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); |