From: Pablo Neira Ayuso <pablo@netfilter.org>
To: netfilter-devel@vger.kernel.org
Cc: gregkh@linuxfoundation.org, stable@vger.kernel.org, sashal@kernel.org
Subject: [PATCH -stable,5.10 00/17] Netfilter stable fixes for 5.10
Date: Fri, 22 Sep 2023 19:01:01 +0200 [thread overview]
Message-ID: <20230922170118.152420-1-pablo@netfilter.org> (raw)
Hi Greg, Sasha,
The following list shows the backported patches, this batch is targeting
at garbage collection (GC) / set timeout fixes that address possible UaF
and memleaks. I am using original commit IDs for reference:
1) 212ed75dc5fb ("netfilter: nf_tables: integrate pipapo into commit protocol")
2) 24138933b97b ("netfilter: nf_tables: don't skip expired elements during walk")
3) 5f68718b34a5 ("netfilter: nf_tables: GC transaction API to avoid race with control plane")
4) f6c383b8c31a ("netfilter: nf_tables: adapt set backend to use GC transaction API")
5) c92db3030492 ("netfilter: nft_set_hash: mark set element as dead when deleting from packet path")
6) a2dd0233cbc4 ("netfilter: nf_tables: remove busy mark and gc batch API")
7) 7845914f45f0 ("netfilter: nf_tables: don't fail inserts if duplicate has expired")
8) 6a33d8b73dfa ("netfilter: nf_tables: fix GC transaction races with netns and netlink event exit path")
9) 02c6c24402bf ("netfilter: nf_tables: GC transaction race with netns dismantle")
10) 720344340fb9 ("netfilter: nf_tables: GC transaction race with abort path")
11) 8357bc946a2a ("netfilter: nf_tables: use correct lock to protect gc_list")
12) 8e51830e29e1 ("netfilter: nf_tables: defer gc run if previous batch is still pending")
13) 2ee52ae94baa ("netfilter: nft_set_rbtree: skip sync GC for new elements in this transaction")
14) 96b33300fba8 ("netfilter: nft_set_rbtree: use read spinlock to avoid datapath contention")
15) 6d365eabce3c ("netfilter: nft_set_pipapo: stop GC iteration if GC transaction allocation fails")
16) b079155faae9 ("netfilter: nft_set_hash: try later when GC hits EAGAIN on iteration")
17) cf5000a7787c ("netfilter: nf_tables: fix memleak when more than 255 elements expired")
Please, apply.
Thanks.
Florian Westphal (4):
netfilter: nf_tables: don't skip expired elements during walk
netfilter: nf_tables: don't fail inserts if duplicate has expired
netfilter: nf_tables: defer gc run if previous batch is still pending
netfilter: nf_tables: fix memleak when more than 255 elements expired
Pablo Neira Ayuso (13):
netfilter: nf_tables: integrate pipapo into commit protocol
netfilter: nf_tables: GC transaction API to avoid race with control plane
netfilter: nf_tables: adapt set backend to use GC transaction API
netfilter: nft_set_hash: mark set element as dead when deleting from packet path
netfilter: nf_tables: remove busy mark and gc batch API
netfilter: nf_tables: fix GC transaction races with netns and netlink event exit path
netfilter: nf_tables: GC transaction race with netns dismantle
netfilter: nf_tables: GC transaction race with abort path
netfilter: nf_tables: use correct lock to protect gc_list
netfilter: nft_set_rbtree: skip sync GC for new elements in this transaction
netfilter: nft_set_rbtree: use read spinlock to avoid datapath contention
netfilter: nft_set_pipapo: stop GC iteration if GC transaction allocation fails
netfilter: nft_set_hash: try later when GC hits EAGAIN on iteration
include/net/netfilter/nf_tables.h | 125 +++++------
net/netfilter/nf_tables_api.c | 341 +++++++++++++++++++++++++++---
net/netfilter/nft_set_hash.c | 87 +++++---
net/netfilter/nft_set_pipapo.c | 115 ++++++----
net/netfilter/nft_set_rbtree.c | 157 ++++++++------
5 files changed, 589 insertions(+), 236 deletions(-)
--
2.30.2
next reply other threads:[~2023-09-22 17:01 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-22 17:01 Pablo Neira Ayuso [this message]
2023-09-22 17:01 ` [PATCH -stable,5.10 01/17] netfilter: nf_tables: integrate pipapo into commit protocol Pablo Neira Ayuso
2023-09-22 17:01 ` [PATCH -stable,5.10 02/17] netfilter: nf_tables: don't skip expired elements during walk Pablo Neira Ayuso
2023-09-22 17:01 ` [PATCH -stable,5.10 03/17] netfilter: nf_tables: GC transaction API to avoid race with control plane Pablo Neira Ayuso
2023-09-22 17:01 ` [PATCH -stable,5.10 04/17] netfilter: nf_tables: adapt set backend to use GC transaction API Pablo Neira Ayuso
2023-09-22 17:01 ` [PATCH -stable,5.10 05/17] netfilter: nft_set_hash: mark set element as dead when deleting from packet path Pablo Neira Ayuso
2023-09-22 17:01 ` [PATCH -stable,5.10 06/17] netfilter: nf_tables: remove busy mark and gc batch API Pablo Neira Ayuso
2023-09-22 17:01 ` [PATCH -stable,5.10 07/17] netfilter: nf_tables: don't fail inserts if duplicate has expired Pablo Neira Ayuso
2023-09-22 17:01 ` [PATCH -stable,5.10 08/17] netfilter: nf_tables: fix GC transaction races with netns and netlink event exit path Pablo Neira Ayuso
2023-09-22 17:01 ` [PATCH -stable,5.10 09/17] netfilter: nf_tables: GC transaction race with netns dismantle Pablo Neira Ayuso
2023-09-22 17:01 ` [PATCH -stable,5.10 10/17] netfilter: nf_tables: GC transaction race with abort path Pablo Neira Ayuso
2023-09-22 17:01 ` [PATCH -stable,5.10 11/17] netfilter: nf_tables: use correct lock to protect gc_list Pablo Neira Ayuso
2023-09-22 17:01 ` [PATCH -stable,5.10 12/17] netfilter: nf_tables: defer gc run if previous batch is still pending Pablo Neira Ayuso
2023-09-22 17:01 ` [PATCH -stable,5.10 13/17] netfilter: nft_set_rbtree: skip sync GC for new elements in this transaction Pablo Neira Ayuso
2023-09-22 17:01 ` [PATCH -stable,5.10 14/17] netfilter: nft_set_rbtree: use read spinlock to avoid datapath contention Pablo Neira Ayuso
2023-09-22 17:01 ` [PATCH -stable,5.10 15/17] netfilter: nft_set_pipapo: stop GC iteration if GC transaction allocation fails Pablo Neira Ayuso
2023-09-22 17:01 ` [PATCH -stable,5.10 16/17] netfilter: nft_set_hash: try later when GC hits EAGAIN on iteration Pablo Neira Ayuso
2023-09-22 17:01 ` [PATCH -stable,5.10 17/17] netfilter: nf_tables: fix memleak when more than 255 elements expired 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=20230922170118.152420-1-pablo@netfilter.org \
--to=pablo@netfilter.org \
--cc=gregkh@linuxfoundation.org \
--cc=netfilter-devel@vger.kernel.org \
--cc=sashal@kernel.org \
--cc=stable@vger.kernel.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;
as well as URLs for NNTP newsgroup(s).