Merge tag 'ipsec-next-2023-10-28' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorJakub Kicinski <kuba@kernel.org>
Mon, 30 Oct 2023 21:36:56 +0000 (14:36 -0700)
committerJakub Kicinski <kuba@kernel.org>
Mon, 30 Oct 2023 21:36:57 +0000 (14:36 -0700)
commite0f9f0e0737f47f643a66c6db158af61818336bc
tree94194d97bfdf2a2d5f73e8cc5accda7c95816b05
parent55c900477f5b3897d9038446f72a281cae0efd86
parenteefed7662ff223f70ba8b1af07f1a096a5ece588
Merge tag 'ipsec-next-2023-10-28' of git://git./linux/kernel/git/klassert/ipsec-next

Steffen Klassert says:

====================
pull request (net-next): ipsec-next 2023-10-28

1) Remove unused function declarations of xfrm4_extract_input and
   xfrm6_extract_input. From Yue Haibing.

2) Annotate struct xfrm_sec_ctx with __counted_by.
   From Kees Cook.

3) Support GRO decapsulation for ESP in UDP encapsulation.
   From Antony Antony et all.

4) Replace the xfrm session decode with flow dissector.
   From Florian Westphal.

5) Fix a use after free in __xfrm6_udp_encap_rcv.

6) Fix the layer 4 flowi decoding.
   From Florian Westphal.

* tag 'ipsec-next-2023-10-28' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next:
  xfrm: policy: fix layer 4 flowi decoding
  xfrm Fix use after free in __xfrm6_udp_encap_rcv.
  xfrm: policy: replace session decode with flow dissector
  xfrm: move mark and oif flowi decode into common code
  xfrm: pass struct net to xfrm_decode_session wrappers
  xfrm: Support GRO for IPv6 ESP in UDP encapsulation
  xfrm: Support GRO for IPv4 ESP in UDP encapsulation
  xfrm: Use the XFRM_GRO to indicate a GRO call on input
  xfrm: Annotate struct xfrm_sec_ctx with __counted_by
  xfrm: Remove unused function declarations
====================

Link: https://lore.kernel.org/r/20231028084328.3119236-1-steffen.klassert@secunet.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
include/net/ipv6_stubs.h
net/ipv4/udp.c
net/ipv6/af_inet6.c
net/netfilter/nf_nat_proto.c
net/xfrm/xfrm_interface_core.c
net/xfrm/xfrm_policy.c