Netdev List
 help / color / mirror / Atom feed
From: Florian Westphal <fw@strlen.de>
To: <netdev@vger.kernel.org>
Cc: Paolo Abeni <pabeni@redhat.com>,
	"David S. Miller" <davem@davemloft.net>,
	Eric Dumazet <edumazet@google.com>,
	Jakub Kicinski <kuba@kernel.org>,
	<netfilter-devel@vger.kernel.org>,
	pablo@netfilter.org
Subject: [PATCH net-next 00/11] netfilter: updates for net-next
Date: Mon, 25 May 2026 20:29:13 +0200	[thread overview]
Message-ID: <20260525182924.28456-1-fw@strlen.de> (raw)

Hi,

The following patchset contains Netfilter fixes and small enhancements
for *net-next*:

1) Disable 32-bit x_tables compatibility (32bit binaries on 64bit
   kernel) interface in user namespaces.  This is 'last warning' before
   this is removed for good.

2) Add a configuration toggle for netfilter GCOV profiling. Provide dedicated
   toggles for ipset and ipvs.

3) Remove modular support for nfnetlink and restrict it to built-in only.
   From Pablo Neira Ayuso.

4) Use per-rule hash initval in nf_conncount. This avoids unecessary lock
   contention with short keys (e.g. conntrack zones) in different
   namespaces.

5) Use nf_ct_exp_net() in ctnetlink expectation dumps.
   From Pratham Gupta.

6) Remove a dead conditional in nft_set_rbtree.

7) Fix conntrack helper policy updates to apply per-class values correctly.
   From David Carlier.

8) Fix an off-by-one OOB read in nf_conntrack_irc:parse_dcc(). Use strict
   less-than comparison in the newline search loop to respect the
   exclusive-end pointer convention.  From Muhammad Bilal.

9) Fix typos in nf_conntrack_proto_tcp comments.  From Avinash Duduskar.

10) Restore performance optimization in nft_set_pipapo_avx2 by passing
    the next map index. Refactor lookup logic for clarity and add a
    DEBUG_NET check to document this.

11) Avoid (harmless) u16 overflow in nf_conntrack_ftp when parsing FTP PORT
    and EPRT commands.  Ignore commands where single octet exceeds 255.
    From Giuseppe Caruso.

Patch 12, which removes incorrect (and obviously unused) code from
nft_byteorder was kept back to avoid a net -> net-next merge conflict.

Please, pull these changes from:
The following changes since commit c0aa5f13826dcb035bec3d6b252e6b2020fa5f88:

  Merge branch 'net-dsa-microchip-remove-unnecessary-ksz_dev_ops-callbacks' (2026-05-22 18:40:51 -0700)

are available in the Git repository at:

  https://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf-next.git nf-next-26-05-25

for you to fetch changes up to 2b413fc689ba890348db13a4daa5adf42846ebca:

  netfilter: nf_conntrack_ftp: avoid u16 overflows (2026-05-25 20:00:04 +0200)

----------------------------------------------------------------
netfilter pull request nf-next-26-05-25

----------------------------------------------------------------
Avinash Duduskar (1):
  netfilter: nf_conntrack_proto_tcp: fix typos in comments

David Carlier (1):
  netfilter: nfnl_cthelper: apply per-class values when updating policies

Florian Westphal (5):
  netfilter: x_tables: disable 32bit compat interface in user namespaces
  netfilter: add option for GCOV profiling
  netfilter: nf_conncount: use per-rule hash initval
  netfilter: nft_set_rbtree: remove dead conditional
  netfilter: nft_set_pipapo_avx2: restore performance optimization

Giuseppe Caruso (1):
  netfilter: nf_conntrack_ftp: avoid u16 overflows

Muhammad Bilal (1):
  netfilter: nf_conntrack_irc: fix parse_dcc() off-by-one OOB read

Pablo Neira Ayuso (1):
  netfilter: allow nfnetlink built-in only

Pratham Gupta (1):
  netfilter: ctnetlink: use nf_ct_exp_net() in expectation dump

 include/linux/netfilter/x_tables.h     | 17 +++++++++++++
 net/bridge/Makefile                    |  6 +++++
 net/bridge/netfilter/Makefile          |  4 +++
 net/bridge/netfilter/ebtables.c        |  4 +++
 net/ipv4/Makefile                      |  4 +++
 net/ipv4/netfilter/Makefile            |  4 +++
 net/ipv4/netfilter/arp_tables.c        |  4 +++
 net/ipv4/netfilter/ip_tables.c         |  4 +++
 net/ipv6/Makefile                      |  4 +++
 net/ipv6/netfilter/Makefile            |  4 +++
 net/ipv6/netfilter/ip6_tables.c        |  4 +++
 net/netfilter/Kconfig                  | 10 +++++++-
 net/netfilter/Makefile                 |  6 ++++-
 net/netfilter/ipset/Kconfig            |  9 +++++++
 net/netfilter/ipset/Makefile           |  3 +++
 net/netfilter/ipvs/Kconfig             |  9 +++++++
 net/netfilter/ipvs/Makefile            |  3 +++
 net/netfilter/nf_conncount.c           |  7 +++---
 net/netfilter/nf_conntrack_ftp.c       | 11 +++++---
 net/netfilter/nf_conntrack_irc.c       |  6 ++---
 net/netfilter/nf_conntrack_netlink.c   |  2 +-
 net/netfilter/nf_conntrack_proto_tcp.c |  8 +++---
 net/netfilter/nfnetlink_cthelper.c     |  4 +--
 net/netfilter/nft_set_pipapo_avx2.c    | 35 +++++++++++---------------
 net/netfilter/nft_set_rbtree.c         |  3 ---
 25 files changed, 131 insertions(+), 44 deletions(-)

-- 
2.53.0

             reply	other threads:[~2026-05-25 18:29 UTC|newest]

Thread overview: 29+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-05-25 18:29 Florian Westphal [this message]
2026-05-25 18:29 ` [PATCH net-next 01/11] netfilter: x_tables: disable 32bit compat interface in user namespaces Florian Westphal
2026-05-25 18:29 ` [PATCH net-next 02/11] netfilter: add option for GCOV profiling Florian Westphal
2026-05-25 18:29 ` [PATCH net-next 03/11] netfilter: allow nfnetlink built-in only Florian Westphal
2026-05-25 18:29 ` [PATCH net-next 04/11] netfilter: nf_conncount: use per-rule hash initval Florian Westphal
2026-05-25 18:29 ` [PATCH net-next 05/11] netfilter: ctnetlink: use nf_ct_exp_net() in expectation dump Florian Westphal
2026-05-25 18:29 ` [PATCH net-next 06/11] netfilter: nft_set_rbtree: remove dead conditional Florian Westphal
2026-05-25 18:29 ` [PATCH net-next 07/11] netfilter: nfnl_cthelper: apply per-class values when updating policies Florian Westphal
2026-05-25 18:29 ` [PATCH net-next 08/11] netfilter: nf_conntrack_irc: fix parse_dcc() off-by-one OOB read Florian Westphal
2026-05-25 18:29 ` [PATCH net-next 09/11] netfilter: nf_conntrack_proto_tcp: fix typos in comments Florian Westphal
2026-05-25 18:29 ` [PATCH net-next 10/11] netfilter: nft_set_pipapo_avx2: restore performance optimization Florian Westphal
2026-05-25 18:29 ` [PATCH net-next 11/11] netfilter: nf_conntrack_ftp: avoid u16 overflows Florian Westphal
  -- strict thread matches above, loose matches on Subject: below --
2026-04-10 11:23 [PATCH net-next 00/11] netfilter: updates for net-next Florian Westphal
2026-04-12 16:40 ` Jakub Kicinski
2026-04-12 16:54   ` Florian Westphal
2026-04-12 17:17     ` Florian Westphal
2026-04-12 18:58       ` Pablo Neira Ayuso
2026-04-12 17:53     ` Jakub Kicinski
2026-04-12 18:07       ` Julian Anastasov
2026-02-05 11:08 Florian Westphal
2026-02-06 12:41 ` Florian Westphal
2024-11-06 23:46 [PATCH net-next 00/11] Netfilter " Pablo Neira Ayuso
2024-11-07  0:19 ` Jakub Kicinski
2024-11-07  7:08   ` Florian Westphal
2024-11-07 20:48     ` Jakub Kicinski
2024-11-07 21:07       ` Florian Westphal
2024-11-07 21:09       ` Eric Dumazet
2022-05-19 22:01 Pablo Neira Ayuso
2022-04-11 10:27 Pablo Neira Ayuso

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=20260525182924.28456-1-fw@strlen.de \
    --to=fw@strlen.de \
    --cc=davem@davemloft.net \
    --cc=edumazet@google.com \
    --cc=kuba@kernel.org \
    --cc=netdev@vger.kernel.org \
    --cc=netfilter-devel@vger.kernel.org \
    --cc=pabeni@redhat.com \
    --cc=pablo@netfilter.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