From: Steffen Klassert <steffen.klassert@secunet.com>
To: David Miller <davem@davemloft.net>, Jakub Kicinski <kuba@kernel.org>
Cc: Herbert Xu <herbert@gondor.apana.org.au>,
Steffen Klassert <steffen.klassert@secunet.com>,
<netdev@vger.kernel.org>
Subject: [PATCH 0/10] pull request (net-next): ipsec-next 2023-10-28
Date: Sat, 28 Oct 2023 10:43:18 +0200 [thread overview]
Message-ID: <20231028084328.3119236-1-steffen.klassert@secunet.com> (raw)
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.
Please pull or let me know if there are problems.
Thanks!
The following changes since commit 3a69ab875233734bc434402379100272cd70bde2:
Merge branch 'ionic-better-tx-sg=handling' (2023-09-20 10:52:31 +0100)
are available in the Git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next.git tags/ipsec-next-2023-10-28
for you to fetch changes up to eefed7662ff223f70ba8b1af07f1a096a5ece588:
xfrm: policy: fix layer 4 flowi decoding (2023-10-27 10:12:09 +0200)
----------------------------------------------------------------
ipsec-next-2023-10-28
----------------------------------------------------------------
Florian Westphal (4):
xfrm: pass struct net to xfrm_decode_session wrappers
xfrm: move mark and oif flowi decode into common code
xfrm: policy: replace session decode with flow dissector
xfrm: policy: fix layer 4 flowi decoding
Kees Cook (1):
xfrm: Annotate struct xfrm_sec_ctx with __counted_by
Steffen Klassert (6):
xfrm: Use the XFRM_GRO to indicate a GRO call on input
xfrm: Support GRO for IPv4 ESP in UDP encapsulation
xfrm: Support GRO for IPv6 ESP in UDP encapsulation
Merge branch 'xfrm: Support GRO decapsulation for ESP in UDP encapsulation'
Merge branch 'xfrm: policy: replace session decode with flow dissector'
xfrm Fix use after free in __xfrm6_udp_encap_rcv.
Yue Haibing (1):
xfrm: Remove unused function declarations
include/net/gro.h | 2 +-
include/net/ipv6_stubs.h | 3 +
include/net/xfrm.h | 18 +--
include/uapi/linux/xfrm.h | 3 +-
net/ipv4/esp4_offload.c | 6 +-
net/ipv4/icmp.c | 2 +-
net/ipv4/ip_vti.c | 4 +-
net/ipv4/netfilter.c | 2 +-
net/ipv4/udp.c | 16 +++
net/ipv4/xfrm4_input.c | 95 ++++++++++---
net/ipv6/af_inet6.c | 1 +
net/ipv6/esp6_offload.c | 10 +-
net/ipv6/icmp.c | 2 +-
net/ipv6/ip6_vti.c | 4 +-
net/ipv6/netfilter.c | 2 +-
net/ipv6/xfrm6_input.c | 103 +++++++++++---
net/netfilter/nf_nat_proto.c | 2 +-
net/xfrm/xfrm_input.c | 6 +-
net/xfrm/xfrm_interface_core.c | 4 +-
net/xfrm/xfrm_policy.c | 299 +++++++++++++++++------------------------
20 files changed, 343 insertions(+), 241 deletions(-)
next reply other threads:[~2023-10-28 8:43 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-28 8:43 Steffen Klassert [this message]
2023-10-28 8:43 ` [PATCH 01/10] xfrm: Remove unused function declarations Steffen Klassert
2023-10-31 20:20 ` patchwork-bot+netdevbpf
2023-10-28 8:43 ` [PATCH 02/10] xfrm: Annotate struct xfrm_sec_ctx with __counted_by Steffen Klassert
2023-10-28 8:43 ` [PATCH 03/10] xfrm: Use the XFRM_GRO to indicate a GRO call on input Steffen Klassert
2023-10-28 8:43 ` [PATCH 04/10] xfrm: Support GRO for IPv4 ESP in UDP encapsulation Steffen Klassert
2023-10-28 8:43 ` [PATCH 05/10] xfrm: Support GRO for IPv6 " Steffen Klassert
2023-10-28 8:43 ` [PATCH 06/10] xfrm: pass struct net to xfrm_decode_session wrappers Steffen Klassert
2023-10-28 8:43 ` [PATCH 07/10] xfrm: move mark and oif flowi decode into common code Steffen Klassert
2023-10-28 8:43 ` [PATCH 08/10] xfrm: policy: replace session decode with flow dissector Steffen Klassert
2023-10-28 8:43 ` [PATCH 09/10] xfrm Fix use after free in __xfrm6_udp_encap_rcv Steffen Klassert
2023-10-28 8:43 ` [PATCH 10/10] xfrm: policy: fix layer 4 flowi decoding Steffen Klassert
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231028084328.3119236-1-steffen.klassert@secunet.com \
--to=steffen.klassert@secunet.com \
--cc=davem@davemloft.net \
--cc=herbert@gondor.apana.org.au \
--cc=kuba@kernel.org \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox