espintcp: restore IP CB before handing the packet to xfrm
authorSabrina Dubroca <sd@queasysnail.net>
Thu, 13 Aug 2020 14:24:04 +0000 (16:24 +0200)
committerSteffen Klassert <steffen.klassert@secunet.com>
Mon, 17 Aug 2020 13:58:04 +0000 (15:58 +0200)
commit4eb2e13415757a2bce5bb0d580d22bbeef1f5346
treeb1a3352a3ecb390bc2a5a172c4c3eeec4c92ffea
parent61ee4137b5744d9c555cd4674aae353a45f9cd2e
espintcp: restore IP CB before handing the packet to xfrm

Xiumei reported a bug with espintcp over IPv6 in transport mode,
because xfrm6_transport_finish expects to find IP6CB data (struct
inet6_skb_cb). Currently, espintcp zeroes the CB, but the relevant
part is actually preserved by previous layers (first set up by tcp,
then strparser only zeroes a small part of tcp_skb_tb), so we can just
relocate it to the start of skb->cb.

Fixes: e27cca96cd68 ("xfrm: add espintcp (RFC 8229)")
Reported-by: Xiumei Mu <xmu@redhat.com>
Signed-off-by: Sabrina Dubroca <sd@queasysnail.net>
Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
net/xfrm/espintcp.c