Eric Dumazet
68f40354a3
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-12 11:03:53 +02:00
2024-04-10 16:28:30 +02:00
2022-12-31 13:33:02 +01:00
2024-01-31 16:17:04 -08:00
2023-12-20 17:00:19 +01:00
2023-12-20 17:00:17 +01:00
2024-06-12 11:03:20 +02:00
2024-04-17 11:18:22 +02:00
2024-06-12 11:03:20 +02:00
2023-03-17 08:50:32 +01:00
2024-06-12 11:03:32 +02:00
2023-03-17 08:50:24 +01:00
2024-02-23 09:12:47 +01:00
2023-10-19 23:08:56 +02:00
2024-06-12 11:03:14 +02:00
2023-08-11 12:08:17 +02:00
2023-11-20 11:52:16 +01:00
2023-09-23 11:11:01 +02:00
2024-01-25 15:27:38 -08:00
2024-04-27 17:07:17 +02:00
2024-05-02 16:29:29 +02:00
2024-01-25 15:27:51 -08:00
2024-05-17 11:56:13 +02:00
2022-10-07 09:29:17 +02:00
2024-01-01 12:38:56 +00:00
2024-06-12 11:03:53 +02:00
2024-06-12 11:03:51 +02:00
2024-03-26 18:20:25 -04:00
2024-03-26 18:20:42 -04:00
2023-08-23 17:52:32 +02:00
2024-05-17 11:55:59 +02:00
2024-02-05 20:13:01 +00:00
2024-06-12 11:02:58 +02:00
2024-04-03 15:19:31 +02:00
2024-03-26 18:20:37 -04:00
2024-04-13 13:05:27 +02:00
2024-06-12 11:03:20 +02:00
2024-01-25 15:27:24 -08:00
2024-06-12 11:03:53 +02:00
2024-01-25 15:27:20 -08:00
2024-03-06 14:45:06 +00:00
2024-06-12 11:03:32 +02:00
2024-06-12 11:03:53 +02:00
2024-05-17 11:55:59 +02:00
2024-06-12 11:03:51 +02:00
2024-06-12 11:03:32 +02:00
2024-05-17 11:56:12 +02:00
2023-12-13 18:39:11 +01:00
2024-06-12 11:03:32 +02:00
2024-04-10 16:28:25 +02:00
2024-01-01 12:39:04 +00:00
2024-01-01 12:38:57 +00:00
2024-02-16 19:06:27 +01:00
2024-04-10 16:28:26 +02:00
2024-01-25 15:27:30 -08:00
2024-05-17 11:56:13 +02:00
2024-06-12 11:03:51 +02:00
2024-03-01 13:26:35 +01:00
2024-05-17 11:56:20 +02:00
2024-06-12 11:03:53 +02:00
2024-06-12 11:03:51 +02:00
2024-04-10 16:28:25 +02:00
2024-06-12 11:02:58 +02:00
2024-03-26 18:20:42 -04:00
2024-04-17 11:18:23 +02:00
2024-05-17 11:56:10 +02:00
2023-02-09 11:28:04 +01:00
2022-09-20 14:23:56 -07:00
2023-08-30 16:11:00 +02:00
2024-01-10 17:10:27 +01:00
68f40354a3