Skip to content

Subject: netfilter: updates for net-next

Florian Westphal netdev netfilter-devel 1 version Applied

Status from this message: This series was applied to netdev/net-next.git (main)

Get series with b4
b4 am [email protected]

Versions newest first

  1. v1 Latest10 patches 0 repliesApplied 10/10

Patches in v1 All 10 applied

#Subject and filesSizeRepliesApplied
1/10netfilter: nf_tables: reset table validation state on abortnet/netfilter/nf_tables_api.c+7 -00 repliesApplied
2/10netfilter: nf_conntrack: Add allow_clash to generic protocol handlernet/netfilter/nf_conntrack_proto_generic.c+1 -00 repliesApplied
3/10netfilter: nf_conncount: increase the connection clean up limit to 64include/net/netfilter/nf_conntrack_count.h net/netfilter/nf_conncount.c+11 -50 repliesApplied
4/10netfilter: nf_conntrack: enable icmp clash supportnet/netfilter/nf_conntrack_proto_icmp.c net/netfilter/nf_conntrack_proto_icmpv6.c+2 -00 repliesApplied
5/10netfilter: don't include xt and nftables.h in unrelated subsystemsinclude/linux/audit.h include/net/netfilter/nf_conntrack_tuple.h include/net/netfilter/nf_tables.h +5 more+6 -50 repliesApplied
6/10netfilter: nf_conntrack: don't rely on implicit includesinclude/linux/netfilter/nf_conntrack_proto_gre.h include/net/netfilter/nf_conntrack.h net/netfilter/nf_conntrack_bpf.c +10 more+17 -30 repliesApplied
7/10netfilter: nfnetlink_queue: nfqnl_instance GFP_ATOMIC -> GFP_KERNEL_ACCOUNT allocationnet/netfilter/nfnetlink_queue.c+34 -410 repliesApplied
8/10netfilter: nft_compat: add more restrictions on netlink attributesnet/netfilter/nft_compat.c+10 -30 repliesApplied
9/10netfilter: nf_conncount: fix tracking of connections from localhostnet/netfilter/nf_conncount.c+13 -20 repliesApplied
10/10netfilter: xt_tcpmss: check remaining length before reading optlennet/netfilter/xt_tcpmss.c+1 -10 repliesApplied

Reviews trailers per patch

1 of 10 patches has a Reviewed-by or Acked-by.

PatchFernando Fernandez Mancera
1/10
2/10
3/10
4/10
5/10
6/10
7/10
8/10R-b
9/10
10/10

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes.

Read the v1 thread

Cover letter [PATCH net-next 00/10] Subject: netfilter: updates for net-next

Hi,

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

1) Speed up nftables transactions after earlier transaction failed. Due to a (harmeless) bug we remained in slow paranoia mode until a successful transaction completes.

2) Allow generic tracker to resolve clashes, this avoids very rare packet drops. From Yuto Hamaguchi.

3) Increase the cleanup budget to 64 entries in nf_conncount to reap more entries in one go, from Fernando Fernandez Mancera.

4) Allow icmp trackers to resolve clashes, this avoids very rare initial packet drop with test cases that have high-frequency pings. After this all trackers except tcp and sctp allow clash resolution.

5) Disentangle netfilter headers, don't include nftables/xtables headers in subsystems that are unrelated.

6) Don't rely on implicit includes coming from nf_conntrack_proto_gre.h.

7) Allow nfnetlink_queue nfq instance struct to get accounted via memcg, from Scott Mitchell.

8) Reject bogus xt target/match data upfront via netlink policiy in nft_compat interface rather than relying on x_tables API to do it.

9) Fix nf_conncount breakage when trying to limit loopback flows via prerouting rule, from Fernando Fernandez Mancera.
This is a recent breakage but not seen as urgent enough to rush this via net tree at this late stage in development cycle.

10) Fix a possible off-by-one when parsing tcp option in xtables tcpmss match. Also handled via -next due to late stage in development cycle.

0003-netfilter-nf_conncount-increase-the-connection-clean.patch fixes commit from v5.19-rc1~159^2~45^2~2 0008-netfilter-nft_compat-add-more-restrictions-on-netlin.patch fixes commit from v3.13-rc1~105^2~186^2~8 0009-netfilter-nf_conncount-fix-tracking-of-connections-f.patch fixes commit from nf-next-25-11-28~6

Please, pull these changes from:
The following changes since commit 77b9c4a438fc66e2ab004c411056b3fb71a54f2c:

Merge branch 'netkit-support-for-io_uring-zero-copy-and-af_xdp' (2026-01-20 12:25:29 +0100)

are available in the Git repository at:

https://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf-next.git tags/nf-next-26-01-20

for you to fetch changes up to 735ee8582da3d239eb0c7a53adca61b79fb228b3:

netfilter: xt_tcpmss: check remaining length before reading optlen (2026-01-20 16:23:38 +0100)

----------------------------------------------------------------
netfilter pull request nf-next-26-01-20

----------------------------------------------------------------
Fernando Fernandez Mancera (2):
netfilter: nf_conncount: increase the connection clean up limit to 64
netfilter: nf_conncount: fix tracking of connections from localhost

Florian Westphal (6):
netfilter: nf_tables: reset table validation state on abort
netfilter: nf_conntrack: enable icmp clash support
netfilter: don't include xt and nftables.h in unrelated subsystems
netfilter: nf_conntrack: don't rely on implicit includes
netfilter: nft_compat: add more restrictions on netlink attributes
netfilter: xt_tcpmss: check remaining length before reading optlen

Scott Mitchell (1):
netfilter: nfnetlink_queue: nfqnl_instance GFP_ATOMIC -> GFP_KERNEL_ACCOUNT allocation

Yuto Hamaguchi (1):
netfilter: nf_conntrack: Add allow_clash to generic protocol handler

 include/linux/audit.h                         |  1 -
 .../linux/netfilter/nf_conntrack_proto_gre.h  |  3 -
 include/net/netfilter/nf_conntrack.h          |  1 +
 include/net/netfilter/nf_conntrack_count.h    |  1 +
 include/net/netfilter/nf_conntrack_tuple.h    |  2 +-
 include/net/netfilter/nf_tables.h             |  1 -
 net/bridge/netfilter/nf_conntrack_bridge.c    |  3 +-
 net/netfilter/nf_conncount.c                  | 30 ++++++--
 net/netfilter/nf_conntrack_bpf.c              |  1 +
 net/netfilter/nf_conntrack_h323_main.c        |  1 +
 net/netfilter/nf_conntrack_netlink.c          |  1 +
 net/netfilter/nf_conntrack_proto_generic.c    |  1 +
 net/netfilter/nf_conntrack_proto_gre.c        |  2 +
 net/netfilter/nf_conntrack_proto_icmp.c       |  1 +
 net/netfilter/nf_conntrack_proto_icmpv6.c     |  1 +
 net/netfilter/nf_flow_table_ip.c              |  2 +
 net/netfilter/nf_flow_table_offload.c         |  1 +
 net/netfilter/nf_flow_table_path.c            |  1 +
 net/netfilter/nf_nat_ovs.c                    |  3 +
 net/netfilter/nf_nat_proto.c                  |  1 +
 net/netfilter/nf_synproxy_core.c              |  1 +
 net/netfilter/nf_tables_api.c                 |  8 ++
 net/netfilter/nfnetlink_queue.c               | 75 +++++++++----------
 net/netfilter/nft_compat.c                    | 13 +++-
 net/netfilter/nft_flow_offload.c              |  1 +
 net/netfilter/nft_synproxy.c                  |  1 +
 net/netfilter/xt_tcpmss.c                     |  2 +-
 net/sched/act_ct.c                            |  2 +
 net/sched/act_ctinfo.c                        |  1 +
 29 files changed, 102 insertions(+), 60 deletions(-)
Signature · 1 line
2.52.0