Skip to content

Commit 2176ec1

Browse files
Eli Coopergregkh
authored andcommitted
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>
1 parent 25d8b7c commit 2176ec1

1 file changed

Lines changed: 3 additions & 0 deletions

File tree

net/ipv4/ip_output.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,9 @@ int __ip_local_out(struct net *net, struct sock *sk, struct sk_buff *skb)
102102

103103
iph->tot_len = htons(skb->len);
104104
ip_send_check(iph);
105+
106+
skb->protocol = htons(ETH_P_IP);
107+
105108
return nf_hook(NFPROTO_IPV4, NF_INET_LOCAL_OUT,
106109
net, sk, skb, NULL, skb_dst(skb)->dev,
107110
dst_output);

0 commit comments

Comments
 (0)