diff options
| author | Paul Davey <paul.davey@alliedtelesis.co.nz> | 2024-04-23 18:00:24 +1200 |
|---|---|---|
| committer | Steffen Klassert <steffen.klassert@secunet.com> | 2024-04-26 06:44:33 +0200 |
| commit | 58fbfecab965014b6e3cc956a76b4a96265a1add (patch) | |
| tree | 90322d489f2949d04e1d545854d1e676fa67d1b8 /net/ipv4 | |
| parent | 8b06a24bb625728ac709f2c69405eb01025687e1 (diff) | |
| download | linux-stable-58fbfecab965014b6e3cc956a76b4a96265a1add.tar.gz linux-stable-58fbfecab965014b6e3cc956a76b4a96265a1add.tar.bz2 linux-stable-58fbfecab965014b6e3cc956a76b4a96265a1add.zip | |
xfrm: Preserve vlan tags for transport mode software GRO
The software GRO path for esp transport mode uses skb_mac_header_rebuild
prior to re-injecting the packet via the xfrm_napi_dev. This only
copies skb->mac_len bytes of header which may not be sufficient if the
packet contains 802.1Q tags or other VLAN tags. Worse copying only the
initial header will leave a packet marked as being VLAN tagged but
without the corresponding tag leading to mangling when it is later
untagged.
The VLAN tags are important when receiving the decrypted esp transport
mode packet after GRO processing to ensure it is received on the correct
interface.
Therefore record the full mac header length in xfrm*_transport_input for
later use in corresponding xfrm*_transport_finish to copy the entire mac
header when rebuilding the mac header for GRO. The skb->data pointer is
left pointing skb->mac_header bytes after the start of the mac header as
is expected by the network stack and network and transport header
offsets reset to this location.
Fixes: 7785bba299a8 ("esp: Add a software GRO codepath")
Signed-off-by: Paul Davey <paul.davey@alliedtelesis.co.nz>
Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
Diffstat (limited to 'net/ipv4')
| -rw-r--r-- | net/ipv4/xfrm4_input.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/net/ipv4/xfrm4_input.c b/net/ipv4/xfrm4_input.c index dae35101d189..86382e08140e 100644 --- a/net/ipv4/xfrm4_input.c +++ b/net/ipv4/xfrm4_input.c @@ -63,7 +63,11 @@ int xfrm4_transport_finish(struct sk_buff *skb, int async) ip_send_check(iph); if (xo && (xo->flags & XFRM_GRO)) { - skb_mac_header_rebuild(skb); + /* The full l2 header needs to be preserved so that re-injecting the packet at l2 + * works correctly in the presence of vlan tags. + */ + skb_mac_header_rebuild_full(skb, xo->orig_mac_len); + skb_reset_network_header(skb); skb_reset_transport_header(skb); return 0; } |