Eric Dumazet
25ea5377e3
netfilter: nfnetlink_queue: acquire rcu_read_lock() in instance_destroy_rcu() ...
[ Upstream commit dc21c6cc3d6986d938efbf95de62473982c98dec ]
syzbot reported that nf_reinject() could be called without rcu_read_lock() :
WARNING: suspicious RCU usage
6.9.0-rc7-syzkaller-02060-g5c1672705a1a #0 Not tainted
net/netfilter/nfnetlink_queue.c:263 suspicious rcu_dereference_check() usage!
other info that might help us debug this:
rcu_scheduler_active = 2, debug_locks = 1
2 locks held by syz-executor.4/13427:
#0 : ffffffff8e334f60 (rcu_callback){....}-{0:0}, at: rcu_lock_acquire include/linux/rcupdate.h:329 [inline]
#0 : ffffffff8e334f60 (rcu_callback){....}-{0:0}, at: rcu_do_batch kernel/rcu/tree.c:2190 [inline]
#0 : ffffffff8e334f60 (rcu_callback){....}-{0:0}, at: rcu_core+0xa86/0x1830 kernel/rcu/tree.c:2471
#1 : ffff88801ca92958 (&inst->lock){+.-.}-{2:2}, at: spin_lock_bh include/linux/spinlock.h:356 [inline]
#1 : ffff88801ca92958 (&inst->lock){+.-.}-{2:2}, at: nfqnl_flush net/netfilter/nfnetlink_queue.c:405 [inline]
#1 : ffff88801ca92958 (&inst->lock){+.-.}-{2:2}, at: instance_destroy_rcu+0x30/0x220 net/netfilter/nfnetlink_queue.c:172
stack backtrace:
CPU: 0 PID: 13427 Comm: syz-executor.4 Not tainted 6.9.0-rc7-syzkaller-02060-g5c1672705a1a #0
Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 04/02/2024
Call Trace:
<IRQ>
__dump_stack lib/dump_stack.c:88 [inline]
dump_stack_lvl+0x241/0x360 lib/dump_stack.c:114
lockdep_rcu_suspicious+0x221/0x340 kernel/locking/lockdep.c:6712
nf_reinject net/netfilter/nfnetlink_queue.c:323 [inline]
nfqnl_reinject+0x6ec/0x1120 net/netfilter/nfnetlink_queue.c:397
nfqnl_flush net/netfilter/nfnetlink_queue.c:410 [inline]
instance_destroy_rcu+0x1ae/0x220 net/netfilter/nfnetlink_queue.c:172
rcu_do_batch kernel/rcu/tree.c:2196 [inline]
rcu_core+0xafd/0x1830 kernel/rcu/tree.c:2471
handle_softirqs+0x2d6/0x990 kernel/softirq.c:554
__do_softirq kernel/softirq.c:588 [inline]
invoke_softirq kernel/softirq.c:428 [inline]
__irq_exit_rcu+0xf4/0x1c0 kernel/softirq.c:637
irq_exit_rcu+0x9/0x30 kernel/softirq.c:649
instr_sysvec_apic_timer_interrupt arch/x86/kernel/apic/apic.c:1043 [inline]
sysvec_apic_timer_interrupt+0xa6/0xc0 arch/x86/kernel/apic/apic.c:1043
</IRQ>
<TASK>
Fixes: 9872bec773c2 ("[NETFILTER]: nfnetlink: use RCU for queue instances hash")
Reported-by: syzbot <syzkaller@googlegroups.com>
Signed-off-by: Eric Dumazet <edumazet@google.com>
Acked-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
2024-06-16 13:39:48 +02:00
2024-01-05 15:13:34 +01:00
2022-12-31 13:14:42 +01:00
2024-02-23 08:54:27 +01:00
2023-12-20 15:17:37 +01:00
2023-12-20 15:17:35 +01:00
2022-06-22 14:22:01 +02:00
2024-04-17 11:15:13 +02:00
2024-05-17 11:50:57 +02:00
2022-12-31 13:14:11 +01:00
2024-05-17 11:50:58 +02:00
2023-03-17 08:48:54 +01:00
2024-02-23 08:55:10 +01:00
2023-10-19 23:05:36 +02:00
2024-06-16 13:39:23 +02:00
2023-08-11 15:13:53 +02:00
2023-11-28 16:56:22 +00:00
2024-01-25 14:52:46 -08:00
2024-04-27 17:05:29 +02:00
2024-05-02 16:24:49 +02:00
2024-01-25 14:52:54 -08:00
2024-03-26 18:21:36 -04:00
2022-11-03 23:59:14 +09:00
2024-01-05 15:13:29 +01:00
2024-06-16 13:39:47 +02:00
2024-06-16 13:39:47 +02:00
2024-03-26 18:21:13 -04:00
2024-03-26 18:21:23 -04:00
2023-08-26 14:23:32 +02:00
2024-05-17 11:50:48 +02:00
2022-04-27 14:38:53 +02:00
2024-02-23 08:54:54 +01:00
2024-05-17 11:50:52 +02:00
2024-04-10 16:18:39 +02:00
2023-10-25 11:58:59 +02:00
2023-02-22 12:57:09 +01:00
2024-06-16 13:39:26 +02:00
2024-01-25 14:52:36 -08:00
2024-06-16 13:39:48 +02:00
2024-01-25 14:52:33 -08:00
2024-05-25 16:20:17 +02:00
2024-06-16 13:39:33 +02:00
2024-06-16 13:39:48 +02:00
2024-05-17 11:50:48 +02:00
2024-06-16 13:39:47 +02:00
2024-06-16 13:39:33 +02:00
2024-05-17 11:50:58 +02:00
2023-12-13 18:36:37 +01:00
2024-06-16 13:39:33 +02:00
2024-04-10 16:19:37 +02:00
2024-01-05 15:13:34 +01:00
2024-01-05 15:13:29 +01:00
2024-02-23 08:54:58 +01:00
2024-04-10 16:19:38 +02:00
2023-10-10 21:59:08 +02:00
2024-04-13 13:01:44 +02:00
2024-06-16 13:39:47 +02:00
2024-05-17 11:51:04 +02:00
2024-06-16 13:39:48 +02:00
2024-06-16 13:39:47 +02:00
2024-01-25 14:52:38 -08:00
2024-06-16 13:39:13 +02:00
2024-03-26 18:21:23 -04:00
2024-04-17 11:15:14 +02:00
2024-05-17 11:50:57 +02:00
2023-06-21 15:59:15 +02:00
2023-06-21 15:59:15 +02:00
2024-01-15 18:51:16 +01:00
25ea5377e3