Skip to content

Netfilter fixes for net

Pablo Neira Ayuso netdev netfilter-devel 1 version In review

Get series with b4
b4 am [email protected]

Versions newest first

  1. v1 Latest16 patches 1 replyIn review

Patches in v1 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/16netfilter: flowtable: fix offloaded ct timeout never being extendednet/netfilter/nf_flow_table_core.c+9 -40 replies
2/16netfilter: nf_queue: pin bridge device while NFQUEUE holds fake dstinclude/net/netfilter/nf_queue.h net/netfilter/nf_queue.c net/netfilter/nfnetlink_queue.c+18 -00 replies
3/16netfilter: xt_cluster: reject template conntracks in hash matchnet/netfilter/xt_cluster.c+1 -10 replies
4/16netfilter: flowtable: fix and simplify IP6IP6 tunnel handlingnet/ipv6/ip6_tunnel.c net/netfilter/nf_flow_table_ip.c tools/testing/selftests/net/netfilter/nft_flowtable.sh+30 -650 replies
5/16netfilter: nfnetlink: make OOM conditions fatalnet/netfilter/nfnetlink.c+7 -00 replies
6/16netfilter: ipset: Don't use test_bit() in lockless RCU readers in hash typesnet/netfilter/ipset/ip_set_hash_gen.h+5 -50 replies
7/16netfilter: ipset: Don't use test_bit() in lockless RCU readers in bitmap typesnet/netfilter/ipset/ip_set_bitmap_gen.h net/netfilter/ipset/ip_set_bitmap_ip.c net/netfilter/ipset/ip_set_bitmap_ipmac.c +1 more+6 -40 replies
8/16netfilter: ipset: fix order of kfree_rcu() and rcu_assign_pointer()net/netfilter/ipset/ip_set_core.c+2 -20 replies
9/16netfilter: ipset: make sure gc is properly stoppednet/netfilter/ipset/ip_set_hash_gen.h+1 -10 replies
10/16netfilter: nft_payload: reject offsets exceeding 65535 bytesnet/netfilter/nft_payload.c+13 -30 replies
11/16netfilter: nft_meta_bridge: add validate callback for get operationsinclude/net/netfilter/nft_meta.h net/bridge/netfilter/nft_meta_bridge.c net/netfilter/nft_meta.c+23 -30 replies
12/16netfilter: nft_flow_offload: zero device address for non-ether casenet/netfilter/nf_flow_table_path.c+3 -10 replies
13/16netfilter: nf_reject: skip iphdr options when looking for icmp headernet/ipv4/netfilter/nf_reject_ipv4.c+1 -10 replies
14/16netfilter: nf_conntrack_expect: use conntrack GC to reap expectationsinclude/net/netfilter/nf_conntrack_expect.h include/uapi/linux/netfilter/nf_conntrack_common.h net/netfilter/nf_conntrack_core.c +6 more+139 -1080 replies
15/16netfilter: nf_conntrack_expect: store master_tuple in expectationinclude/net/netfilter/nf_conntrack_expect.h net/netfilter/nf_conntrack_broadcast.c net/netfilter/nf_conntrack_expect.c +1 more+7 -60 replies
16/16netfilter: nft_meta_bridge: fix NFT_META_BRI_IIFPVID stack leaknet/bridge/netfilter/nft_meta_bridge.c+3 -10 replies

Reviews trailers per patch

2 of 16 patches have a Reviewed-by or Acked-by.

PatchFernando Fernandez Mancera
1/16
2/16
3/16
4/16
5/16
6/16
7/16
8/16
9/16
10/16R-b
11/16R-b
12/16
13/16
14/16
15/16
16/16

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 00/16] Netfilter fixes for net

Hi,

The following patchset contains Netfilter fixes for net, this contains fixes for a few crash, but many of the patches are trivial/correctness fixes. There is too one rework of the conntrack expectation timeout strategy to deal with a possible race when removing an expectation.

1) Fix the incorrect flowtable timeout extension for entries in hw offload, from Adrian Bente. This is correcting a defect in the functionality, no crash.

2) Hold reference to device under the fake dst in br_netfilter, from Haoze Xie. This is fixing a possible UaF if the device is removed while packet is sitting in nfqueue.

3) Reject template conntrack in xt_cluster, otherwise access to uninitialize conntrack fields are possible leading to WARN_ON due to unset layer 3 protocol. From Wyatt Feng.

4) Make sure the IPv6 tunnel header is in the linear skb data area before pulling. While at it remove incomplete NEXTHDR_DEST support. From Lorenzo Bianconi. This possibly leading to crash if IPv4 header is not linear, but GRO already guarantees this, unlikely but still possible.

5) Bail out immediately if ENOMEM is seen in a nfnetlink batch, no further processing since this will accumulate more bogus errors. From Florian Westphal. Functionally improvements under memory stress, no crash.

6) Use test_bit_acquire in ipset hash set to avoid reordering of subsequent memory access. This is addressing a LLM related report, no crash has been observed. From Jozsef Kadlecsik.

7) Use test_bit_acquire in ipset bitmap set too, for the same reason as in the previous patch, from Jozsef Kadlecsik.

8) Call kfree_rcu() after rcu_assign_pointer() to address a possible UaF, very hard to trigger. Never observed in practise, reported by LLM. Also from Jozsef Kadlecsik.

9) Use disable_delayed_work_sync() instead cancel_delayed_work_sync() to avoid that ipset GC handler re-queues work as reported by LLM. From Jozsef Kadlecsik. This is for correctness.

10) Restore the check in nft_payload for exceeding payloda offset over 2^16. From Florian Westphal. This fixes a silent truncation, not a big deal, but better be assertive and reject it.

11) Validate NFT_META_BRI_IIFHWADDR can only run from bridge prerouting. From Florian Westphal. Harmless but it could allow to read bytes from skb->cb.

12) Zero out destination hardware address during the flowtable path setup, also from Florian. This is a correctness fix, LLM points that possible infoleak can happen but topology to achieve it is not clear.

13) Skip IPv4 options if present when building the IPV4 reject reply. Otherwise bytes in the IPv4 options header can be sent back to origin where the ICMP header is being expected. Again from Florian Westphal.

14) Replace timer API for expectation by GC worker approach. This is implicitly fixing a race between nf_ct_remove_expectations() which might fail to remove the expectation due to timer_del() returning false because timer has expired and callback is being run concurrently. This fix is addressing a crash that has been already reported with a reproducer.

15) Store the master tuple in the expectation, since SLAB_TYPESAFE_BY_RCU does not guarantee that accessing exp->master under rcu read lock refer to the right master conntrack. Found by initial round of fixes for expectation by LLM also found this.

16) Check if br_vlan_get_pvid_rcu() fails to address a possible stack infoleak of 4-bytes. From Florian Westphal.

This is slightly over the 15 patch limit in batches, please, allow this round to exceed it by one.

Please, pull these changes from:

git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf.git nf-26-06-19

Thanks.

----------------------------------------------------------------

The following changes since commit 96e7f9122aae0ed000ee321f324b812a447906d9:

eth: fbnic: take netif_addr_lock_bh() around rx mode address programming (2026-06-18 18:36:26 -0700)

are available in the Git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf.git tags/nf-26-06-19

for you to fetch changes up to 05477f7a037c127854b58441f60b34210668f5c3:

netfilter: nft_meta_bridge: fix NFT_META_BRI_IIFPVID stack leak (2026-06-19 12:27:08 +0200)

----------------------------------------------------------------
netfilter pull request 26-06-19

----------------------------------------------------------------
Adrian Bente (1):
netfilter: flowtable: fix offloaded ct timeout never being extended

Florian Westphal (6):
netfilter: nfnetlink: make OOM conditions fatal
netfilter: nft_payload: reject offsets exceeding 65535 bytes
netfilter: nft_meta_bridge: add validate callback for get operations
netfilter: nft_flow_offload: zero device address for non-ether case
netfilter: nf_reject: skip iphdr options when looking for icmp header
netfilter: nft_meta_bridge: fix NFT_META_BRI_IIFPVID stack leak

Haoze Xie (1):
netfilter: nf_queue: pin bridge device while NFQUEUE holds fake dst

Jozsef Kadlecsik (4):
netfilter: ipset: Don't use test_bit() in lockless RCU readers in hash types
netfilter: ipset: Don't use test_bit() in lockless RCU readers in bitmap types
netfilter: ipset: fix order of kfree_rcu() and rcu_assign_pointer()
netfilter: ipset: make sure gc is properly stopped

Lorenzo Bianconi (1):
netfilter: flowtable: fix and simplify IP6IP6 tunnel handling

Pablo Neira Ayuso (2):
netfilter: nf_conntrack_expect: use conntrack GC to reap expectations
netfilter: nf_conntrack_expect: store master_tuple in expectation

Wyatt Feng (1):
netfilter: xt_cluster: reject template conntracks in hash match

 include/net/netfilter/nf_conntrack_expect.h        |  17 ++-
 include/net/netfilter/nf_queue.h                   |   1 +
 include/net/netfilter/nft_meta.h                   |   2 +
 include/uapi/linux/netfilter/nf_conntrack_common.h |   1 +
 net/bridge/netfilter/nft_meta_bridge.c             |  23 +++-
 net/ipv4/netfilter/nf_reject_ipv4.c                |   2 +-
 net/ipv6/ip6_tunnel.c                              |   7 +
 net/netfilter/ipset/ip_set_bitmap_gen.h            |   4 +-
 net/netfilter/ipset/ip_set_bitmap_ip.c             |   2 +-
 net/netfilter/ipset/ip_set_bitmap_ipmac.c          |   2 +-
 net/netfilter/ipset/ip_set_bitmap_port.c           |   2 +-
 net/netfilter/ipset/ip_set_core.c                  |   4 +-
 net/netfilter/ipset/ip_set_hash_gen.h              |  12 +-
 net/netfilter/nf_conntrack_broadcast.c             |   1 +
 net/netfilter/nf_conntrack_core.c                  |  33 ++++-
 net/netfilter/nf_conntrack_expect.c                | 147 +++++++++++----------
 net/netfilter/nf_conntrack_h323_main.c             |   4 +-
 net/netfilter/nf_conntrack_helper.c                |  10 +-
 net/netfilter/nf_conntrack_netlink.c               |  31 ++---
 net/netfilter/nf_conntrack_sip.c                   |  13 +-
 net/netfilter/nf_flow_table_core.c                 |  13 +-
 net/netfilter/nf_flow_table_ip.c                   |  80 +++--------
 net/netfilter/nf_flow_table_path.c                 |   4 +-
 net/netfilter/nf_queue.c                           |  14 ++
 net/netfilter/nfnetlink.c                          |   7 +
 net/netfilter/nfnetlink_queue.c                    |   3 +
 net/netfilter/nft_ct.c                             |   3 +-
 net/netfilter/nft_meta.c                           |   5 +-
 net/netfilter/nft_payload.c                        |  16 ++-
 net/netfilter/xt_cluster.c                         |   2 +-
 .../selftests/net/netfilter/nft_flowtable.sh       |   8 +-
 31 files changed, 268 insertions(+), 205 deletions(-)