• Paul Davey's avatar
    xfrm: Preserve vlan tags for transport mode software GRO · 58fbfeca
    Paul Davey authored
    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: 7785bba2 ("esp: Add a software GRO codepath")
    Signed-off-by: default avatarPaul Davey <paul.davey@alliedtelesis.co.nz>
    Signed-off-by: default avatarSteffen Klassert <steffen.klassert@secunet.com>
    58fbfeca
xfrm_input.c 18.7 KB