Commit 26dbd66e authored by Sabrina Dubroca's avatar Sabrina Dubroca Committed by Steffen Klassert
Browse files

esp: choose the correct inner protocol for GSO on inter address family tunnels 



Commit 23c7f8d7 ("net: Fix esp GSO on inter address family
tunnels.") is incomplete. It passes to skb_eth_gso_segment the
protocol for the outer IP version, instead of the inner IP version, so
we end up calling inet_gso_segment on an inner IPv6 packet and
ipv6_gso_segment on an inner IPv4 packet and the packets are dropped.

This patch completes the fix by selecting the correct protocol based
on the inner mode's family.

Fixes: c35fe410 ("xfrm: Add mode handlers for IPsec on layer 2")
Signed-off-by: default avatarSabrina Dubroca <sd@queasysnail.net>
Signed-off-by: default avatarSteffen Klassert <steffen.klassert@secunet.com>
parent ebe5555c

net/ipv4/esp4_offload.c

+4 −1
Original line number Diff line number Diff line
@@ -110,7 +110,10 @@ static struct sk_buff *xfrm4_tunnel_gso_segment(struct xfrm_state *x, 
						struct sk_buff *skb,

						netdev_features_t features)

{

	return skb_eth_gso_segment(skb, features, htons(ETH_P_IP));

	__be16 type = x->inner_mode.family == AF_INET6 ? htons(ETH_P_IPV6)

						       : htons(ETH_P_IP);



	return skb_eth_gso_segment(skb, features, type);

}



static struct sk_buff *xfrm4_transport_gso_segment(struct xfrm_state *x,

net/ipv6/esp6_offload.c

+4 −1
Original line number Diff line number Diff line
@@ -145,7 +145,10 @@ static struct sk_buff *xfrm6_tunnel_gso_segment(struct xfrm_state *x, 
						struct sk_buff *skb,

						netdev_features_t features)

{

	return skb_eth_gso_segment(skb, features, htons(ETH_P_IPV6));

	__be16 type = x->inner_mode.family == AF_INET ? htons(ETH_P_IP)

						      : htons(ETH_P_IPV6);



	return skb_eth_gso_segment(skb, features, type);

}



static struct sk_buff *xfrm6_transport_gso_segment(struct xfrm_state *x,