Skip to content

netfilter updates for net

Florian Westphal netdev netfilter-devel 1 version Applied

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

Get series with b4
b4 am [email protected]

Versions newest first

  1. v1 Latest6 patches 0 repliesApplied 6/6

Patches in v1 All 6 applied

#Subject and filesSizeRepliesApplied
1/6netfilter: nf_tables: validate all pending tablesinclude/net/netfilter/nf_tables.h net/netfilter/nf_tables_api.c+8 -40 repliesApplied
2/6netfilter: nf_tables: flush pending destroy work before netlink notifiernet/netfilter/nf_tables_api.c+1 -10 repliesApplied
3/6netfilter: nf_tables: GC transaction race with abort pathnet/netfilter/nf_tables_api.c+5 -10 repliesApplied
4/6netfilter: nf_tables: use correct lock to protect gc_listnet/netfilter/nf_tables_api.c+2 -20 repliesApplied
5/6netfilter: nf_tables: fix out of memory error handlingnet/netfilter/nft_set_pipapo.c+10 -30 repliesApplied
6/6netfilter: nf_tables: defer gc run if previous batch is still pendinginclude/net/netfilter/nf_tables.h net/netfilter/nft_set_hash.c net/netfilter/nft_set_rbtree.c+11 -00 repliesApplied

Reviews trailers per patch

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

PatchStefano BrivioPablo Neira Ayuso
1/6
2/6
3/6
4/6
5/6R-b
6/6R-b

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 0/6] netfilter updates for net

Hello,

This PR contains nf_tables updates for your *net* tree.

First patch fixes table validation, I broke this in 6.4 when tracking validation state per table, reported by Pablo, fixup from myself.

Second patch makes sure objects waiting for memory release have been released, this was broken in 6.1, patch from Pablo Neira Ayuso.

Patch three is a fix-for-fix from previous PR: In case a transaction gets aborted, gc sequence counter needs to be incremented so pending gc requests are invalidated, from Pablo.

Same for patch 4: gc list needs to use gc list lock, not destroy lock, also from Pablo.

Patch 5 fixes a UaF in a set backend, but this should only occur when failslab is enabled for GFP_KERNEL allocations, broken since feature was added in 5.6, from myself.

Patch 6 fixes a double-free bug that was also added via previous PR:
We must not schedule gc work if the previous batch is still queued.

The following changes since commit bfedba3b2c7793ce127680bc8f70711e05ec7a17:

ibmveth: Use dcbf rather than dcbfl (2023-08-23 11:51:16 +0100)

are available in the Git repository at:

ssh://[email protected]/pub/scm/linux/kernel/git/netfilter/nf tags/nf-23-08-23

for you to fetch changes up to 8e51830e29e12670b4c10df070a4ea4c9593e961:

netfilter: nf_tables: defer gc run if previous batch is still pending (2023-08-23 16:12:59 +0200)

----------------------------------------------------------------
netfilter pull request 2023-08-23

----------------------------------------------------------------
Florian Westphal (3):
netfilter: nf_tables: validate all pending tables
netfilter: nf_tables: fix out of memory error handling
netfilter: nf_tables: defer gc run if previous batch is still pending

Pablo Neira Ayuso (3):
netfilter: nf_tables: flush pending destroy work before netlink notifier
netfilter: nf_tables: GC transaction race with abort path
netfilter: nf_tables: use correct lock to protect gc_list

 include/net/netfilter/nf_tables.h |  6 ++++++
 net/netfilter/nf_tables_api.c     | 23 +++++++++++++++--------
 net/netfilter/nft_set_hash.c      |  3 +++
 net/netfilter/nft_set_pipapo.c    | 13 ++++++++++---
 net/netfilter/nft_set_rbtree.c    |  3 +++
 5 files changed, 37 insertions(+), 11 deletions(-)