• Sabrina Dubroca's avatar
    xfrm: esp6: fix the location of the transport header with encapsulation · d5dba137
    Sabrina Dubroca authored
    commit 17175d1a ("xfrm: esp6: fix encapsulation header offset
    computation") changed esp6_input_done2 to correctly find the size of
    the IPv6 header that precedes the TCP/UDP encapsulation header, but
    didn't adjust the final call to skb_set_transport_header, which I
    assumed was correct in using skb_network_header_len.
    
    Xiumei Mu reported that when we create xfrm states that include port
    numbers in the selector, traffic from the user sockets is dropped. It
    turns out that we get a state mismatch in __xfrm_policy_check, because
    we end up trying to compare the encapsulation header's ports with the
    selector that's based on user traffic ports.
    
    Fixes: 0146dca7 ("xfrm: add support for UDPv6 encapsulation of ESP")
    Fixes: 26333c37 ("xfrm: add IPv6 support for espintcp")
    Reported-by: default avatarXiumei Mu <xmu@redhat.com>
    Signed-off-by: default avatarSabrina Dubroca <sd@queasysnail.net>
    Signed-off-by: default avatarSteffen Klassert <steffen.klassert@secunet.com>
    d5dba137
esp6.c 28.9 KB