Kuniyuki Iwashima
2e29ff824b
af_unix: Suppress false-positive lockdep splat for spin_lock() in __unix_gc(). ...
[ Upstream commit 1971d13ffa84a551d29a81fdf5b5ec5be166ac83 ]
syzbot reported a lockdep splat regarding unix_gc_lock and
unix_state_lock().
One is called from recvmsg() for a connected socket, and another
is called from GC for TCP_LISTEN socket.
So, the splat is false-positive.
Let's add a dedicated lock class for the latter to suppress the splat.
Note that this change is not necessary for net-next.git as the issue
is only applied to the old GC impl.
[0]:
WARNING: possible circular locking dependency detected
6.9.0-rc5-syzkaller-00007-g4d2008430ce8 #0 Not tainted
-----------------------------------------------------
kworker/u8:1/11 is trying to acquire lock:
ffff88807cea4e70 (&u->lock){+.+.}-{2:2}, at: spin_lock include/linux/spinlock.h:351 [inline]
ffff88807cea4e70 (&u->lock){+.+.}-{2:2}, at: __unix_gc+0x40e/0xf70 net/unix/garbage.c:302
but task is already holding lock:
ffffffff8f6ab638 (unix_gc_lock){+.+.}-{2:2}, at: spin_lock include/linux/spinlock.h:351 [inline]
ffffffff8f6ab638 (unix_gc_lock){+.+.}-{2:2}, at: __unix_gc+0x117/0xf70 net/unix/garbage.c:261
which lock already depends on the new lock.
the existing dependency chain (in reverse order) is:
-> #1 (unix_gc_lock){+.+.}-{2:2}:
lock_acquire+0x1ed/0x550 kernel/locking/lockdep.c:5754
__raw_spin_lock include/linux/spinlock_api_smp.h:133 [inline]
_raw_spin_lock+0x2e/0x40 kernel/locking/spinlock.c:154
spin_lock include/linux/spinlock.h:351 [inline]
unix_notinflight+0x13d/0x390 net/unix/garbage.c:140
unix_detach_fds net/unix/af_unix.c:1819 [inline]
unix_destruct_scm+0x221/0x350 net/unix/af_unix.c:1876
skb_release_head_state+0x100/0x250 net/core/skbuff.c:1188
skb_release_all net/core/skbuff.c:1200 [inline]
__kfree_skb net/core/skbuff.c:1216 [inline]
kfree_skb_reason+0x16d/0x3b0 net/core/skbuff.c:1252
kfree_skb include/linux/skbuff.h:1262 [inline]
manage_oob net/unix/af_unix.c:2672 [inline]
unix_stream_read_generic+0x1125/0x2700 net/unix/af_unix.c:2749
unix_stream_splice_read+0x239/0x320 net/unix/af_unix.c:2981
do_splice_read fs/splice.c:985 [inline]
splice_file_to_pipe+0x299/0x500 fs/splice.c:1295
do_splice+0xf2d/0x1880 fs/splice.c:1379
__do_splice fs/splice.c:1436 [inline]
__do_sys_splice fs/splice.c:1652 [inline]
__se_sys_splice+0x331/0x4a0 fs/splice.c:1634
do_syscall_x64 arch/x86/entry/common.c:52 [inline]
do_syscall_64+0xf5/0x240 arch/x86/entry/common.c:83
entry_SYSCALL_64_after_hwframe+0x77/0x7f
-> #0 (&u->lock){+.+.}-{2:2}:
check_prev_add kernel/locking/lockdep.c:3134 [inline]
check_prevs_add kernel/locking/lockdep.c:3253 [inline]
validate_chain+0x18cb/0x58e0 kernel/locking/lockdep.c:3869
__lock_acquire+0x1346/0x1fd0 kernel/locking/lockdep.c:5137
lock_acquire+0x1ed/0x550 kernel/locking/lockdep.c:5754
__raw_spin_lock include/linux/spinlock_api_smp.h:133 [inline]
_raw_spin_lock+0x2e/0x40 kernel/locking/spinlock.c:154
spin_lock include/linux/spinlock.h:351 [inline]
__unix_gc+0x40e/0xf70 net/unix/garbage.c:302
process_one_work kernel/workqueue.c:3254 [inline]
process_scheduled_works+0xa10/0x17c0 kernel/workqueue.c:3335
worker_thread+0x86d/0xd70 kernel/workqueue.c:3416
kthread+0x2f0/0x390 kernel/kthread.c:388
ret_from_fork+0x4b/0x80 arch/x86/kernel/process.c:147
ret_from_fork_asm+0x1a/0x30 arch/x86/entry/entry_64.S:244
other info that might help us debug this:
Possible unsafe locking scenario:
CPU0 CPU1
---- ----
lock(unix_gc_lock);
lock(&u->lock);
lock(unix_gc_lock);
lock(&u->lock);
*** DEADLOCK ***
3 locks held by kworker/u8:1/11:
#0 : ffff888015089148 ((wq_completion)events_unbound){+.+.}-{0:0}, at: process_one_work kernel/workqueue.c:3229 [inline]
#0 : ffff888015089148 ((wq_completion)events_unbound){+.+.}-{0:0}, at: process_scheduled_works+0x8e0/0x17c0 kernel/workqueue.c:3335
#1 : ffffc90000107d00 (unix_gc_work){+.+.}-{0:0}, at: process_one_work kernel/workqueue.c:3230 [inline]
#1 : ffffc90000107d00 (unix_gc_work){+.+.}-{0:0}, at: process_scheduled_works+0x91b/0x17c0 kernel/workqueue.c:3335
#2 : ffffffff8f6ab638 (unix_gc_lock){+.+.}-{2:2}, at: spin_lock include/linux/spinlock.h:351 [inline]
#2 : ffffffff8f6ab638 (unix_gc_lock){+.+.}-{2:2}, at: __unix_gc+0x117/0xf70 net/unix/garbage.c:261
stack backtrace:
CPU: 0 PID: 11 Comm: kworker/u8:1 Not tainted 6.9.0-rc5-syzkaller-00007-g4d2008430ce8 #0
Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 03/27/2024
Workqueue: events_unbound __unix_gc
Call Trace:
<TASK>
__dump_stack lib/dump_stack.c:88 [inline]
dump_stack_lvl+0x241/0x360 lib/dump_stack.c:114
check_noncircular+0x36a/0x4a0 kernel/locking/lockdep.c:2187
check_prev_add kernel/locking/lockdep.c:3134 [inline]
check_prevs_add kernel/locking/lockdep.c:3253 [inline]
validate_chain+0x18cb/0x58e0 kernel/locking/lockdep.c:3869
__lock_acquire+0x1346/0x1fd0 kernel/locking/lockdep.c:5137
lock_acquire+0x1ed/0x550 kernel/locking/lockdep.c:5754
__raw_spin_lock include/linux/spinlock_api_smp.h:133 [inline]
_raw_spin_lock+0x2e/0x40 kernel/locking/spinlock.c:154
spin_lock include/linux/spinlock.h:351 [inline]
__unix_gc+0x40e/0xf70 net/unix/garbage.c:302
process_one_work kernel/workqueue.c:3254 [inline]
process_scheduled_works+0xa10/0x17c0 kernel/workqueue.c:3335
worker_thread+0x86d/0xd70 kernel/workqueue.c:3416
kthread+0x2f0/0x390 kernel/kthread.c:388
ret_from_fork+0x4b/0x80 arch/x86/kernel/process.c:147
ret_from_fork_asm+0x1a/0x30 arch/x86/entry/entry_64.S:244
</TASK>
Fixes: 47d8ac011fe1 ("af_unix: Fix garbage collector racing against connect()")
Reported-and-tested-by: syzbot+fa379358c28cc87cc307@syzkaller.appspotmail.com
Closes: https://syzkaller.appspot.com/bug?extid=fa379358c28cc87cc307
Signed-off-by: Kuniyuki Iwashima <kuniyu@amazon.com>
Link: https://lore.kernel.org/r/20240424170443.9832-1-kuniyu@amazon.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
2024-05-02 16:24:47 +02:00
2022-08-17 14:24:07 +02:00
2024-01-25 14:52:40 -08:00
2021-07-01 13:19:48 -07:00
2021-01-28 20:36:21 -08:00
2024-04-27 17:05:24 +02:00
2024-04-27 17:05:24 +02:00
2021-11-25 09:48:40 +01:00
2023-03-11 13:57:28 +01:00
2023-03-11 13:57:29 +01:00
2020-02-28 14:51:30 +01:00
2021-08-02 10:24:38 +01:00
2024-04-17 11:15:14 +02:00
2021-04-23 10:17:26 +01:00
2024-05-02 16:24:47 +02:00
2022-03-23 09:16:41 +01:00
2022-04-13 20:59:05 +02:00
2022-04-20 09:34:22 +02:00
2021-08-03 13:05:25 +01:00
2020-07-21 18:30:47 -07:00
2022-09-28 11:11:48 +02:00
2023-06-14 11:13:00 +02:00
2023-06-05 09:21:19 +02:00
2023-08-30 16:18:15 +02:00
2021-03-26 17:43:55 +01:00
2022-08-31 17:16:43 +02:00
2023-08-16 18:22:01 +02:00
2024-04-10 16:18:39 +02:00
2022-03-02 11:47:58 +01:00
2020-07-15 07:45:24 -07:00
2020-03-27 19:40:38 -07:00
2021-08-05 11:46:42 +01:00
2021-08-14 13:59:10 +01:00
2024-04-27 17:05:29 +02:00
2019-12-16 16:09:44 -08:00
2021-12-08 09:04:46 +01:00
2022-02-16 12:56:30 +01:00
2024-01-15 18:51:25 +01:00
2023-06-21 15:59:19 +02:00
2020-05-05 13:23:29 -07:00
2022-04-27 14:38:52 +02:00
2020-04-20 07:34:16 +02:00
2019-12-24 22:37:30 -08:00
2021-12-08 09:04:43 +01:00
2022-04-20 09:34:09 +02:00
2022-06-14 18:36:17 +02:00
2023-11-20 11:08:28 +01:00
2021-01-21 13:33:45 +01:00
2021-01-21 13:33:45 +01:00
2019-12-09 10:36:44 -08:00
2019-11-05 18:20:55 -08:00
2023-12-13 18:36:38 +01:00
2021-01-29 20:39:14 -08:00
2021-03-18 19:51:12 -07:00
2020-06-22 21:12:44 -07:00
2019-10-25 16:24:32 -07:00
2021-06-28 14:29:45 -07:00
2021-08-13 09:58:25 +02:00
2022-10-26 12:35:54 +02:00
2023-12-20 15:17:34 +01:00
2022-08-17 14:23:36 +02:00
2021-01-27 18:18:15 -08:00
2024-04-10 16:19:35 +02:00
2020-12-14 18:38:58 -08:00
2022-01-27 11:05:35 +01:00
2023-11-28 16:56:22 +00:00
2022-08-17 14:23:36 +02:00
2019-09-27 12:05:02 +02:00
2021-07-21 08:14:33 -07:00
2020-06-20 17:47:53 -07:00
2023-09-19 12:22:58 +02:00
2021-08-05 15:08:47 -07:00
2022-05-09 09:14:36 +02:00
2023-10-25 11:59:00 +02:00
2024-04-17 11:15:14 +02:00
2023-05-24 17:36:46 +01:00
2023-09-19 12:22:58 +02:00
2022-01-27 11:05:35 +01:00
2024-03-06 14:38:50 +00:00
2023-09-19 12:23:04 +02:00
2020-06-20 17:22:22 -07:00
2021-03-23 14:14:50 -07:00
2019-10-08 13:23:05 -07:00
2024-02-23 08:54:27 +01:00
2021-11-18 19:17:10 +01:00
2023-09-19 12:22:34 +02:00
2021-09-27 12:02:54 +02:00
2023-10-19 23:05:34 +02:00
2021-10-18 13:47:09 +01:00
2021-08-25 11:23:14 +01:00
2020-03-02 11:16:27 -08:00
2021-03-26 15:14:56 -07:00
2020-02-28 12:08:37 -08:00
2020-05-29 21:20:20 -07:00
2023-01-12 11:58:52 +01:00
2022-12-31 13:14:42 +01:00
2022-03-08 19:12:33 +01:00
2023-06-21 15:59:19 +02:00
2024-04-27 17:05:24 +02:00
2021-07-27 11:43:50 +01:00
2019-11-12 08:18:03 -08:00
2021-09-24 14:07:10 +01:00
2021-12-01 09:04:46 +01:00
2023-06-05 09:21:22 +02:00
2020-03-04 13:25:55 -08:00
2021-08-30 16:33:59 -07:00
2023-07-23 13:47:45 +02:00
2022-11-10 18:15:38 +01:00
2021-08-09 15:34:21 -07:00
2022-07-21 21:24:27 +02:00
2021-03-25 17:40:43 -07:00
2020-07-31 09:24:23 +02:00
2020-08-24 14:35:00 -07:00
2022-07-29 17:25:09 +02:00
2023-06-14 11:13:02 +02:00
2023-08-30 16:18:14 +02:00
2023-02-01 08:27:09 +01:00
2023-05-11 23:00:26 +09:00
2022-05-18 10:26:53 +02:00
2022-01-27 11:05:05 +01:00
2021-04-28 14:06:45 -07:00
2020-09-28 15:19:03 -07:00
2019-10-05 16:29:00 -07:00
2022-12-31 13:14:07 +01:00
2024-04-10 16:19:35 +02:00
2021-08-03 13:05:26 +01:00
2024-03-06 14:38:47 +00:00
2021-08-04 12:35:07 +01:00
2024-03-01 13:21:50 +01:00
2019-10-04 14:07:07 -07:00
2024-03-06 14:38:47 +00:00
2020-06-23 20:10:15 -07:00
2020-06-18 20:46:23 -07:00
2022-09-15 11:30:05 +02:00
2023-04-26 13:51:54 +02:00
2023-04-26 13:51:54 +02:00
2019-11-14 18:12:17 -08:00
2023-08-11 15:13:54 +02:00
2019-12-09 10:28:43 -08:00
2019-11-16 12:39:10 -08:00
2022-06-14 18:36:18 +02:00
2021-06-24 19:41:15 +02:00
2023-06-05 09:21:21 +02:00
2023-06-28 10:29:45 +02:00
2023-05-11 23:00:27 +09:00
2e29ff824b