Skip to content

netfilter fixes 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 Latest9 patches 0 repliesApplied 9/9

Patches in v1 All 9 applied

#Subject and filesSizeRepliesApplied
1/9netfilter: nf_tables: fix false-positive lockdep splatnet/netfilter/nft_set_pipapo.c+12 -10 repliesApplied
2/9netfilter: nf_tables: fix kdoc warnings after gc reworkinclude/net/netfilter/nf_tables.h net/netfilter/nft_set_pipapo.c+2 -10 repliesApplied
3/9netfilter: nf_tables: deactivate catchall elements in next generationnet/netfilter/nf_tables_api.c+1 -00 repliesApplied
4/9netfilter: nf_tables: don't fail inserts if duplicate has expirednet/netfilter/nft_set_pipapo.c+4 -190 repliesApplied
5/9netfilter: set default timeout to 3 secs for sctp shutdown send and recv stateDocumentation/networking/nf_conntrack-sysctl.rst net/netfilter/nf_conntrack_proto_sctp.c+5 -50 repliesApplied
6/9ipvs: fix racy memcpy in proc_do_sync_thresholdnet/netfilter/ipvs/ip_vs_ctl.c+4 -00 repliesApplied
7/9netfilter: nf_tables: fix GC transaction races with netns and netlink event exit pathnet/netfilter/nf_tables_api.c+32 -40 repliesApplied
8/9netfilter: nf_tables: GC transaction race with netns dismantlenet/netfilter/nf_tables_api.c+6 -10 repliesApplied
9/9netfilter: nft_dynset: disallow object mapsnet/netfilter/nft_dynset.c+3 -00 repliesApplied

Reviews trailers per patch

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

PatchSimon HormanJulian Anastasov
1/9
2/9
3/9
4/9
5/9R-b
6/9A-b A-b
7/9
8/9
9/9

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/9] netfilter fixes for net

Hello,

These are netfilter fixes for the *net* tree.

First patch resolves a false-positive lockdep splat:
rcu_dereference is used outside of rcu read lock. Let lockdep validate that the transaction mutex is locked.

Second patch fixes a kdoc warning added in previous PR.

Third patch fixes a memory leak:
The catchall element isn't disabled correctly, this allows userspace to deactivate the element again. This results in refcount underflow which in turn prevents memory release. This was always broken since the feature was added in 5.13.

Patch 4 fixes an incorrect change in the previous pull request:
Adding a duplicate key to a set should work if the duplicate key has expired, restore this behaviour. All from myself.

Patch #5 resolves an old historic artifact in sctp conntrack:
a 300ms timeout for shutdown_ack. Increase this to 3s. From Xin Long.

Patch #6 fixes a sysctl data race in ipvs, two threads can clobber the sysctl value, from Sishuai Gong. This is a day-0 bug that predates git history.

Patches 7, 8 and 9, from Pablo Neira Ayuso, are also followups for the previous GC rework in nf_tables: The netlink notifier and the netns exit path must both increment the gc worker seqcount, else worker may encounter stale (free'd) pointers.

The following changes since commit e4dd0d3a2f64b8bd8029ec70f52bdbebd0644408:

net: fix the RTO timer retransmitting skb every 1ms if linear option is enabled (2023-08-15 20:24:04 +0100)

are available in the Git repository at:

https://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf.git tags/nf-23-08-16

for you to fetch changes up to 23185c6aed1ffb8fc44087880ba2767aba493779:

netfilter: nft_dynset: disallow object maps (2023-08-16 00:05:15 +0200)

----------------------------------------------------------------
nf pull request 2023-08-16

----------------------------------------------------------------
Florian Westphal (4):
netfilter: nf_tables: fix false-positive lockdep splat
netfilter: nf_tables: fix kdoc warnings after gc rework
netfilter: nf_tables: deactivate catchall elements in next generation
netfilter: nf_tables: don't fail inserts if duplicate has expired

Pablo Neira Ayuso (3):
netfilter: nf_tables: fix GC transaction races with netns and netlink event exit path
netfilter: nf_tables: GC transaction race with netns dismantle
netfilter: nft_dynset: disallow object maps

Sishuai Gong (1):
ipvs: fix racy memcpy in proc_do_sync_threshold

Xin Long (1):
netfilter: set default timeout to 3 secs for sctp shutdown send and recv state

 Documentation/networking/nf_conntrack-sysctl.rst |  4 +--
 include/net/netfilter/nf_tables.h                |  1 +
 net/netfilter/ipvs/ip_vs_ctl.c                   |  4 +++
 net/netfilter/nf_conntrack_proto_sctp.c          |  6 ++--
 net/netfilter/nf_tables_api.c                    | 44 +++++++++++++++++++++---
 net/netfilter/nft_dynset.c                       |  3 ++
 net/netfilter/nft_set_pipapo.c                   | 38 +++++++++-----------
 7 files changed, 69 insertions(+), 31 deletions(-)