Netfilter fixes for net
Subsystems (3)
Pablo Neira Ayuso
maintainercover Netfilter fixes for net
Hi,
The following batch contains a oneliner patch to inconditionally flush workqueue containing stale objects to be released, syzbot managed to trigger UaF. Patch from Florian Westphal.
Please, pull these changes from:
git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf.git nf-24-07-04
Thanks.
----------------------------------------------------------------
The following changes since commit 8905a2c7d39b921b8a62bcf80da0f8c45ec0e764:
Merge branch 'net-txgbe-fix-msi-and-intx-interrupts' (2024-07-02 16:07:07 +0200)
are available in the Git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf.git tags/nf-24-07-04
for you to fetch changes up to 9f6958ba2e902f9820c594869bd710ba74b7c4c0:
netfilter: nf_tables: unconditionally flush pending work before notifier (2024-07-04 00:28:27 +0200)
----------------------------------------------------------------
netfilter pull request 24-07-04
----------------------------------------------------------------
Florian Westphal (1):
netfilter: nf_tables: unconditionally flush pending work before notifier
net/netfilter/nf_tables_api.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
Pablo Neira Ayuso
maintainerPATCH 1/1 netfilter: nf_tables: unconditionally flush pending work before notifier
From: Florian Westphal <[email protected]>
syzbot reports:
KASAN: slab-uaf in nft_ctx_update include/net/netfilter/nf_tables.h:1831 KASAN: slab-uaf in nft_commit_release net/netfilter/nf_tables_api.c:9530 KASAN: slab-uaf int nf_tables_trans_destroy_work+0x152b/0x1750 net/netfilter/nf_tables_api.c:9597 Read of size 2 at addr ffff88802b0051c4 by task kworker/1:1/45 [..] Workqueue: events nf_tables_trans_destroy_work Call Trace: nft_ctx_update include/net/netfilter/nf_tables.h:1831 [inline] nft_commit_release net/netfilter/nf_tables_api.c:9530 [inline] nf_tables_trans_destroy_work+0x152b/0x1750 net/netfilter/nf_tables_api.c:9597
Problem is that the notifier does a conditional flush, but its possible that the table-to-be-removed is still referenced by transactions being processed by the worker, so we need to flush unconditionally.
We could make the flush_work depend on whether we found a table to delete in nf-next to avoid the flush for most cases.
AFAICS this problem is only exposed in nf-next, with
commit e169285f8c56 ("netfilter: nf_tables: do not store nft_ctx in transaction objects"), with this commit applied there is an unconditional fetch oftable->family which is whats triggering the above splat.
--- net/netfilter/nf_tables_api.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
net/netfilter/nf_tables_api.c +1 -2
@@ -11483,8 +11483,7 @@ static int nft_rcv_nl_event(struct notifier_block *this, unsigned long event, gc_seq =nft_gc_seq_begin (nft_net); -if (!list_empty (&nf_tables_destroy_list)) -nf_tables_trans_destroy_flush_work (); +nf_tables_trans_destroy_flush_work (); again:list_for_each_entry (table, &nft_net->tables, list) { if (nft_table_has_owner(table) &&
Signature · 1 line
2.30.2
Paolo Abeni
maintainerRe: [PATCH net 1/1] netfilter: nf_tables: unconditionally flush pending work before notifier
Hi,
Quoted 41 lines · Pablo Neira Ayuso
From: Florian Westphal <[email protected]>
syzbot reports:
KASAN: slab-uaf in nft_ctx_update include/net/netfilter/nf_tables.h:1831 KASAN: slab-uaf in nft_commit_release net/netfilter/nf_tables_api.c:9530 KASAN: slab-uaf int nf_tables_trans_destroy_work+0x152b/0x1750 net/netfilter/nf_tables_api.c:9597 Read of size 2 at addr ffff88802b0051c4 by task kworker/1:1/45 [..] Workqueue: events nf_tables_trans_destroy_work Call Trace: nft_ctx_update include/net/netfilter/nf_tables.h:1831 [inline] nft_commit_release net/netfilter/nf_tables_api.c:9530 [inline] nf_tables_trans_destroy_work+0x152b/0x1750 net/netfilter/nf_tables_api.c:9597Problem is that the notifier does a conditional flush, but its possible that the table-to-be-removed is still referenced by transactions being processed by the worker, so we need to flush unconditionally.
We could make the
flush_workdepend on whether we found a table to delete in nf-next to avoid the flush for most cases.AFAICS this problem is only exposed in nf-next, with
commite169285f8c56("netfilter:nf_tables: do not storenft_ctxin transaction objects"), with this commit applied there is an unconditional fetch oftable->familywhich is whats triggering the above splat.Fixes 2c9f0293280e ("netfilter: nf_tables: flush pending destroy work before netlink notifier")Reported-and-tested-by [email protected]Signed-off-by Florian Westphal <[email protected]>Signed-off-by Pablo Neira Ayuso <[email protected]>--- net/netfilter/nf_tables_api.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)net/netfilter/nf_tables_api.c +0
-0
net/netfilter/nf_tables_api.c static int nft_rcv_nl_event(struct notifier_block *this, unsigned long event, · line 11489
Quoted 9 lines
net/netfilter/nf_tables_api.c +1
-2@@ -11483,8 +11483,7 @@ static int nft_rcv_nl_event(struct notifier_block *this, unsigned long event, gc_seq =nft_gc_seq_begin (nft_net); -if (!list_empty (&nf_tables_destroy_list)) -nf_tables_trans_destroy_flush_work (); +nf_tables_trans_destroy_flush_work (); again:list_for_each_entry (table, &nft_net->tables, list) { if (nft_table_has_owner(table) &&
It look like there is still some discussion around this patch, but I guess we can still take it and in the worst case scenario a follow-up will surface, right?
Thanks!
Paolo
Pablo Neira Ayuso
maintainerRe: [PATCH net 1/1] netfilter: nf_tables: unconditionally flush pending work before notifier
Quoted 47 lines · Paolo Abeni
Hi,
Quoted 44 lines · Pablo Neira Ayuso
From: Florian Westphal <[email protected]>
syzbot reports:
KASAN: slab-uaf in nft_ctx_update include/net/netfilter/nf_tables.h:1831 KASAN: slab-uaf in nft_commit_release net/netfilter/nf_tables_api.c:9530 KASAN: slab-uaf int nf_tables_trans_destroy_work+0x152b/0x1750 net/netfilter/nf_tables_api.c:9597 Read of size 2 at addr ffff88802b0051c4 by task kworker/1:1/45 [..] Workqueue: events nf_tables_trans_destroy_work Call Trace: nft_ctx_update include/net/netfilter/nf_tables.h:1831 [inline] nft_commit_release net/netfilter/nf_tables_api.c:9530 [inline] nf_tables_trans_destroy_work+0x152b/0x1750 net/netfilter/nf_tables_api.c:9597Problem is that the notifier does a conditional flush, but its possible that the table-to-be-removed is still referenced by transactions being processed by the worker, so we need to flush unconditionally.
We could make the
flush_workdepend on whether we found a table to delete in nf-next to avoid the flush for most cases.AFAICS this problem is only exposed in nf-next, with
commite169285f8c56("netfilter:nf_tables: do not storenft_ctxin transaction objects"), with this commit applied there is an unconditional fetch oftable->familywhich is whats triggering the above splat.Fixes 2c9f0293280e ("netfilter: nf_tables: flush pending destroy work before netlink notifier")Reported-and-tested-by [email protected]Signed-off-by Florian Westphal <[email protected]>Signed-off-by Pablo Neira Ayuso <[email protected]>--- net/netfilter/nf_tables_api.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)net/netfilter/nf_tables_api.c +0
-0@@ -11483,8 +11483,7 @@ static int nft_rcv_nl_event(struct notifier_block *this, unsigned long event, gc_seq =nft_gc_seq_begin (nft_net);
Quoted 10 lines
net/netfilter/nf_tables_api.c static int nft_rcv_nl_event(struct notifier_block *this, unsigned long event, · line 11489
Quoted 6 lines
net/netfilter/nf_tables_api.c +1
-2-if (!list_empty (&nf_tables_destroy_list)) -nf_tables_trans_destroy_flush_work (); +nf_tables_trans_destroy_flush_work (); again:list_for_each_entry (table, &nft_net->tables, list) { if (nft_table_has_owner(table) &&It look like there is still some discussion around this patch, but I guess we can still take it and in the worst case scenario a follow-up will surface, right?
Let's do that.
Thanks.
Re: [PATCH net 1/1] netfilter: nf_tables: unconditionally flush pending work before notifier
In reply to Pablo Neira AyusoThis patch was applied to netdev/net.git (main) by Pablo Neira Ayuso <[email protected]>:
Hello:
This patch was applied to netdev/net.git (main)
by Pablo Neira Ayuso <[email protected]>:
Quoted 15 lines · On Thu, 4 Jul 2024 00:33:04 +0200 you wrote:
From: Florian Westphal <[email protected]>
syzbot reports:
KASAN: slab-uaf in nft_ctx_update include/net/netfilter/nf_tables.h:1831 KASAN: slab-uaf in nft_commit_release net/netfilter/nf_tables_api.c:9530 KASAN: slab-uaf int nf_tables_trans_destroy_work+0x152b/0x1750 net/netfilter/nf_tables_api.c:9597 Read of size 2 at addr ffff88802b0051c4 by task kworker/1:1/45 [..] Workqueue: events nf_tables_trans_destroy_work Call Trace: nft_ctx_update include/net/netfilter/nf_tables.h:1831 [inline] nft_commit_release net/netfilter/nf_tables_api.c:9530 [inline] nf_tables_trans_destroy_work+0x152b/0x1750 net/netfilter/nf_tables_api.c:9597
Quoted 1 line
[...]
Here is the summary with links:
- [net,1/1] netfilter: nf_tables: unconditionally flush pending work before notifier
https://git.kernel.org/netdev/net/c/9f6958ba2e90
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html