diff options
| author | Steffen Klassert <steffen.klassert@secunet.com> | 2022-03-07 13:11:41 +0100 |
|---|---|---|
| committer | Steffen Klassert <steffen.klassert@secunet.com> | 2022-03-07 13:14:04 +0100 |
| commit | 23c7f8d7989e1646aac82f75761b7648c355cb8a (patch) | |
| tree | 3a2cce55445d12ac2ed9131bf45a518b1a999bfd /net/ipv6/esp6_offload.c | |
| parent | esp: Fix BEET mode inter address family tunneling on GSO (diff) | |
| download | linux-23c7f8d7989e1646aac82f75761b7648c355cb8a.tar.xz linux-23c7f8d7989e1646aac82f75761b7648c355cb8a.zip | |
net: Fix esp GSO on inter address family tunnels.
The esp tunnel GSO handlers use skb_mac_gso_segment to
push the inner packet to the segmentation handlers.
However, skb_mac_gso_segment takes the Ethernet Protocol
ID from 'skb->protocol' which is wrong for inter address
family tunnels. We fix this by introducing a new
skb_eth_gso_segment function.
This function can be used if it is necessary to pass the
Ethernet Protocol ID directly to the segmentation handler.
First users of this function will be the esp4 and esp6
tunnel segmentation handlers.
Fixes: c35fe4106b92 ("xfrm: Add mode handlers for IPsec on layer 2")
Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
Diffstat (limited to 'net/ipv6/esp6_offload.c')
| -rw-r--r-- | net/ipv6/esp6_offload.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/ipv6/esp6_offload.c b/net/ipv6/esp6_offload.c index e61172d50817..3a293838a91d 100644 --- a/net/ipv6/esp6_offload.c +++ b/net/ipv6/esp6_offload.c @@ -145,8 +145,7 @@ static struct sk_buff *xfrm6_tunnel_gso_segment(struct xfrm_state *x, struct sk_buff *skb, netdev_features_t features) { - __skb_push(skb, skb->mac_len); - return skb_mac_gso_segment(skb, features); + return skb_eth_gso_segment(skb, features, htons(ETH_P_IPV6)); } static struct sk_buff *xfrm6_transport_gso_segment(struct xfrm_state *x, |