Kuniyuki Iwashima
ae7c8f52aa
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:23:43 +02:00
2020-07-15 20:34:11 -07:00
2024-05-02 16:23:34 +02:00
2021-06-10 13:39:24 +02:00
2020-05-19 12:50:14 -07:00
2024-02-23 08:42:32 +01:00
2023-10-25 11:54:19 +02:00
2023-07-27 08:43:37 +02:00
2023-03-11 16:40:12 +01:00
2022-05-18 10:23:44 +02:00
2020-02-28 14:51:30 +01:00
2021-04-14 08:42:05 +02:00
2024-05-02 16:23:34 +02:00
2020-08-20 18:21:28 +01:00
2024-05-02 16:23:43 +02:00
2022-03-23 09:13:27 +01:00
2022-04-13 21:00:57 +02:00
2022-04-20 09:23:31 +02:00
2020-07-21 18:30:47 -07:00
2022-09-28 11:10:31 +02:00
2023-06-14 11:09:31 +02:00
2019-07-04 12:30:48 -07:00
2023-08-30 16:23:14 +02:00
2020-09-25 13:58:01 -07:00
2022-08-31 17:15:20 +02:00
2023-08-16 18:21:02 +02:00
2024-04-13 12:58:25 +02:00
2022-03-02 11:42:50 +01:00
2020-07-15 07:45:24 -07:00
2020-03-27 19:40:38 -07:00
2024-03-26 18:21:53 -04:00
2020-10-09 12:06:53 -07:00
2020-10-05 05:56:48 -07:00
2019-12-16 16:09:44 -08:00
2021-12-08 09:03:22 +01:00
2022-02-16 12:54:26 +01:00
2024-01-15 18:48:07 +01:00
2023-06-21 15:45:40 +02:00
2020-05-05 13:23:29 -07:00
2022-04-27 13:53:48 +02:00
2020-04-20 07:34:16 +02:00
2019-12-24 22:37:30 -08:00
2021-12-08 09:03:21 +01:00
2022-04-20 09:23:11 +02:00
2022-06-14 18:32:40 +02:00
2023-11-20 11:06:55 +01:00
2020-07-31 09:24:24 +02:00
2020-07-31 09:24:24 +02:00
2019-12-09 10:36:44 -08:00
2019-11-05 18:20:55 -08:00
2023-12-13 18:27:06 +01:00
2020-06-22 21:12:44 -07:00
2019-10-25 16:24:32 -07:00
2021-03-04 11:38:46 +01:00
2020-07-31 09:27:00 +02:00
2022-10-26 13:25:55 +02:00
2023-12-20 15:44:27 +01:00
2022-08-21 15:15:51 +02:00
2020-05-09 00:48:20 +02:00
2024-04-13 12:59:15 +02:00
2020-12-01 17:16:54 -08:00
2022-01-27 10:54:33 +01:00
2022-08-21 15:15:51 +02:00
2022-08-21 15:15:51 +02:00
2019-09-27 12:05:02 +02:00
2020-06-20 17:47:53 -07:00
2022-02-01 17:25:44 +01:00
2021-08-12 13:22:07 +02:00
2022-05-09 09:05:04 +02:00
2023-10-25 11:54:23 +02:00
2024-05-02 16:23:34 +02:00
2023-05-30 12:57:49 +01:00
2023-09-19 12:20:26 +02:00
2022-01-27 10:54:33 +01:00
2021-12-01 09:19:05 +01:00
2023-09-19 12:20:30 +02:00
2020-02-05 14:28:09 +01:00
2020-06-20 17:22:22 -07:00
2019-10-08 13:23:05 -07:00
2024-02-23 08:41:56 +01:00
2021-11-18 14:04:27 +01:00
2023-09-19 12:20:09 +02:00
2021-06-23 14:42:52 +02:00
2023-10-25 11:54:14 +02:00
2020-03-02 11:16:27 -08:00
2020-02-29 21:52:20 -08:00
2020-02-28 12:08:37 -08:00
2020-05-29 21:20:20 -07:00
2023-01-14 10:16:51 +01:00
2023-01-14 10:16:18 +01:00
2020-08-24 06:40:07 -07:00
2023-06-21 15:45:40 +02:00
2021-06-23 14:42:44 +02:00
2020-10-09 20:22:32 -07:00
2019-11-12 08:18:03 -08:00
2021-10-06 15:55:53 +02:00
2021-12-01 09:19:03 +01:00
2021-05-19 10:13:17 +02:00
2020-03-04 13:25:55 -08:00
2021-06-03 09:00:51 +02:00
2023-07-27 08:44:24 +02:00
2022-11-10 18:14:26 +01:00
2021-08-18 08:59:11 +02:00
2022-07-21 21:20:10 +02:00
2021-04-14 08:42:07 +02:00
2020-07-31 09:24:23 +02:00
2020-08-24 14:35:00 -07:00
2022-06-09 10:21:09 +02:00
2023-06-14 11:09:42 +02:00
2023-08-30 16:23:13 +02:00
2023-05-30 12:57:56 +01:00
2023-05-17 11:47:47 +02:00
2022-05-30 09:33:23 +02:00
2020-06-04 15:39:32 -07:00
2020-09-28 15:19:03 -07:00
2019-10-05 16:29:00 -07:00
2022-10-30 09:41:19 +01:00
2024-04-13 12:59:15 +02:00
2021-11-18 14:04:27 +01:00
2022-12-02 17:39:57 +01:00
2024-03-01 13:16:49 +01:00
2019-10-04 14:07:07 -07:00
2022-07-21 21:20:13 +02:00
2020-06-23 20:10:15 -07:00
2020-06-18 20:46:23 -07:00
2022-04-08 14:39:54 +02:00
2023-04-26 11:27:41 +02:00
2023-04-26 11:27:41 +02:00
2019-11-14 18:12:17 -08:00
2023-08-11 11:57:50 +02:00
2020-07-15 20:34:02 -07:00
2019-12-09 10:28:43 -08:00
2019-11-16 12:39:10 -08:00
2020-08-31 21:15:04 +02:00
2021-01-17 14:17:05 +01:00
2020-12-09 16:27:42 +01:00
2023-06-28 10:28:10 +02:00
2023-05-17 11:47:50 +02:00
ae7c8f52aa