]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
xfrm: fix inbound ipv4/udp/esp packets to UDPv6 dualstack sockets
authorMaciej Żenczykowski <maze@google.com>
Mon, 5 Jun 2023 11:06:54 +0000 (04:06 -0700)
committerRoxana Nicolescu <roxana.nicolescu@canonical.com>
Mon, 2 Oct 2023 15:19:20 +0000 (17:19 +0200)
commit7e9513fd325bbd72a4731df2d3d23ce292ad7ca7
tree55b9e6e0e76839e218ad0618995ba18e1073e650
parent8e5eb5d7ab6ab4ba70ea8758c21c94740c583199
xfrm: fix inbound ipv4/udp/esp packets to UDPv6 dualstack sockets

BugLink: https://bugs.launchpad.net/bugs/2033931
[ Upstream commit 1166a530a84758bb9e6b448fc8c195ed413f5ded ]

Before Linux v5.8 an AF_INET6 SOCK_DGRAM (udp/udplite) socket
with SOL_UDP, UDP_ENCAP, UDP_ENCAP_ESPINUDP{,_NON_IKE} enabled
would just unconditionally use xfrm4_udp_encap_rcv(), afterwards
such a socket would use the newly added xfrm6_udp_encap_rcv()
which only handles IPv6 packets.

Cc: Sabrina Dubroca <sd@queasysnail.net>
Cc: Steffen Klassert <steffen.klassert@secunet.com>
Cc: Jakub Kicinski <kuba@kernel.org>
Cc: Benedict Wong <benedictwong@google.com>
Cc: Yan Yan <evitayan@google.com>
Fixes: 0146dca70b87 ("xfrm: add support for UDPv6 encapsulation of ESP")
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Reviewed-by: Simon Horman <simon.horman@corigine.com>
Reviewed-by: Sabrina Dubroca <sd@queasysnail.net>
Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
net/ipv4/xfrm4_input.c
net/ipv6/xfrm6_input.c