Eric Dumazet
c8f6b3b864
af_unix: fix lockdep positive in sk_diag_dump_icons() ...
[ Upstream commit 4d322dce82a1d44f8c83f0f54f95dd1b8dcf46c9 ]
syzbot reported a lockdep splat [1].
Blamed commit hinted about the possible lockdep
violation, and code used unix_state_lock_nested()
in an attempt to silence lockdep.
It is not sufficient, because unix_state_lock_nested()
is already used from unix_state_double_lock().
We need to use a separate subclass.
This patch adds a distinct enumeration to make things
more explicit.
Also use swap() in unix_state_double_lock() as a clean up.
v2: add a missing inline keyword to unix_state_lock_nested()
[1]
WARNING: possible circular locking dependency detected
6.8.0-rc1-syzkaller-00356-g8a696a29c690 #0 Not tainted
syz-executor.1/2542 is trying to acquire lock:
ffff88808b5df9e8 (rlock-AF_UNIX){+.+.}-{2:2}, at: skb_queue_tail+0x36/0x120 net/core/skbuff.c:3863
but task is already holding lock:
ffff88808b5dfe70 (&u->lock/1){+.+.}-{2:2}, at: unix_dgram_sendmsg+0xfc7/0x2200 net/unix/af_unix.c:2089
which lock already depends on the new lock.
the existing dependency chain (in reverse order) is:
-> #1 (&u->lock/1){+.+.}-{2:2}:
lock_acquire+0x1e3/0x530 kernel/locking/lockdep.c:5754
_raw_spin_lock_nested+0x31/0x40 kernel/locking/spinlock.c:378
sk_diag_dump_icons net/unix/diag.c:87 [inline]
sk_diag_fill+0x6ea/0xfe0 net/unix/diag.c:157
sk_diag_dump net/unix/diag.c:196 [inline]
unix_diag_dump+0x3e9/0x630 net/unix/diag.c:220
netlink_dump+0x5c1/0xcd0 net/netlink/af_netlink.c:2264
__netlink_dump_start+0x5d7/0x780 net/netlink/af_netlink.c:2370
netlink_dump_start include/linux/netlink.h:338 [inline]
unix_diag_handler_dump+0x1c3/0x8f0 net/unix/diag.c:319
sock_diag_rcv_msg+0xe3/0x400
netlink_rcv_skb+0x1df/0x430 net/netlink/af_netlink.c:2543
sock_diag_rcv+0x2a/0x40 net/core/sock_diag.c:280
netlink_unicast_kernel net/netlink/af_netlink.c:1341 [inline]
netlink_unicast+0x7e6/0x980 net/netlink/af_netlink.c:1367
netlink_sendmsg+0xa37/0xd70 net/netlink/af_netlink.c:1908
sock_sendmsg_nosec net/socket.c:730 [inline]
__sock_sendmsg net/socket.c:745 [inline]
sock_write_iter+0x39a/0x520 net/socket.c:1160
call_write_iter include/linux/fs.h:2085 [inline]
new_sync_write fs/read_write.c:497 [inline]
vfs_write+0xa74/0xca0 fs/read_write.c:590
ksys_write+0x1a0/0x2c0 fs/read_write.c:643
do_syscall_x64 arch/x86/entry/common.c:52 [inline]
do_syscall_64+0xf5/0x230 arch/x86/entry/common.c:83
entry_SYSCALL_64_after_hwframe+0x63/0x6b
-> #0 (rlock-AF_UNIX){+.+.}-{2:2}:
check_prev_add kernel/locking/lockdep.c:3134 [inline]
check_prevs_add kernel/locking/lockdep.c:3253 [inline]
validate_chain+0x1909/0x5ab0 kernel/locking/lockdep.c:3869
__lock_acquire+0x1345/0x1fd0 kernel/locking/lockdep.c:5137
lock_acquire+0x1e3/0x530 kernel/locking/lockdep.c:5754
__raw_spin_lock_irqsave include/linux/spinlock_api_smp.h:110 [inline]
_raw_spin_lock_irqsave+0xd5/0x120 kernel/locking/spinlock.c:162
skb_queue_tail+0x36/0x120 net/core/skbuff.c:3863
unix_dgram_sendmsg+0x15d9/0x2200 net/unix/af_unix.c:2112
sock_sendmsg_nosec net/socket.c:730 [inline]
__sock_sendmsg net/socket.c:745 [inline]
____sys_sendmsg+0x592/0x890 net/socket.c:2584
___sys_sendmsg net/socket.c:2638 [inline]
__sys_sendmmsg+0x3b2/0x730 net/socket.c:2724
__do_sys_sendmmsg net/socket.c:2753 [inline]
__se_sys_sendmmsg net/socket.c:2750 [inline]
__x64_sys_sendmmsg+0xa0/0xb0 net/socket.c:2750
do_syscall_x64 arch/x86/entry/common.c:52 [inline]
do_syscall_64+0xf5/0x230 arch/x86/entry/common.c:83
entry_SYSCALL_64_after_hwframe+0x63/0x6b
other info that might help us debug this:
Possible unsafe locking scenario:
CPU0 CPU1
---- ----
lock(&u->lock/1);
lock(rlock-AF_UNIX);
lock(&u->lock/1);
lock(rlock-AF_UNIX);
*** DEADLOCK ***
1 lock held by syz-executor.1/2542:
#0 : ffff88808b5dfe70 (&u->lock/1){+.+.}-{2:2}, at: unix_dgram_sendmsg+0xfc7/0x2200 net/unix/af_unix.c:2089
stack backtrace:
CPU: 1 PID: 2542 Comm: syz-executor.1 Not tainted 6.8.0-rc1-syzkaller-00356-g8a696a29c690 #0
Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 11/17/2023
Call Trace:
<TASK>
__dump_stack lib/dump_stack.c:88 [inline]
dump_stack_lvl+0x1e7/0x2d0 lib/dump_stack.c:106
check_noncircular+0x366/0x490 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+0x1909/0x5ab0 kernel/locking/lockdep.c:3869
__lock_acquire+0x1345/0x1fd0 kernel/locking/lockdep.c:5137
lock_acquire+0x1e3/0x530 kernel/locking/lockdep.c:5754
__raw_spin_lock_irqsave include/linux/spinlock_api_smp.h:110 [inline]
_raw_spin_lock_irqsave+0xd5/0x120 kernel/locking/spinlock.c:162
skb_queue_tail+0x36/0x120 net/core/skbuff.c:3863
unix_dgram_sendmsg+0x15d9/0x2200 net/unix/af_unix.c:2112
sock_sendmsg_nosec net/socket.c:730 [inline]
__sock_sendmsg net/socket.c:745 [inline]
____sys_sendmsg+0x592/0x890 net/socket.c:2584
___sys_sendmsg net/socket.c:2638 [inline]
__sys_sendmmsg+0x3b2/0x730 net/socket.c:2724
__do_sys_sendmmsg net/socket.c:2753 [inline]
__se_sys_sendmmsg net/socket.c:2750 [inline]
__x64_sys_sendmmsg+0xa0/0xb0 net/socket.c:2750
do_syscall_x64 arch/x86/entry/common.c:52 [inline]
do_syscall_64+0xf5/0x230 arch/x86/entry/common.c:83
entry_SYSCALL_64_after_hwframe+0x63/0x6b
RIP: 0033:0x7f26d887cda9
Code: 28 00 00 00 75 05 48 83 c4 28 c3 e8 e1 20 00 00 90 48 89 f8 48 89 f7 48 89 d6 48 89 ca 4d 89 c2 4d 89 c8 4c 8b 4c 24 08 0f 05 <48> 3d 01 f0 ff ff 73 01 c3 48 c7 c1 b0 ff ff ff f7 d8 64 89 01 48
RSP: 002b:00007f26d95a60c8 EFLAGS: 00000246 ORIG_RAX: 0000000000000133
RAX: ffffffffffffffda RBX: 00007f26d89abf80 RCX: 00007f26d887cda9
RDX: 000000000000003e RSI: 00000000200bd000 RDI: 0000000000000004
RBP: 00007f26d88c947a R08: 0000000000000000 R09: 0000000000000000
R10: 00000000000008c0 R11: 0000000000000246 R12: 0000000000000000
R13: 000000000000000b R14: 00007f26d89abf80 R15: 00007ffcfe081a68
Fixes: 2aac7a2cb0d9 ("unix_diag: Pending connections IDs NLA")
Reported-by: syzbot <syzkaller@googlegroups.com>
Signed-off-by: Eric Dumazet <edumazet@google.com>
Reviewed-by: Kuniyuki Iwashima <kuniyu@amazon.com>
Link: https://lore.kernel.org/r/20240130184235.1620738-1-edumazet@google.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
2024-02-23 08:54:54 +01: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-02-23 08:54:54 +01:00
2023-10-25 11:58:56 +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
2023-12-20 15:17:34 +01:00
2021-04-23 10:17:26 +01:00
2024-02-23 08:54:54 +01: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
2020-02-29 14:39:08 +01: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
2023-06-05 09:21:17 +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-02-23 08:54:27 +01: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
2023-09-19 12:22:59 +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
2021-12-01 09:04:49 +01: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
2022-04-13 20:59:03 +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
2023-11-28 16:56:16 +00:00
2021-08-03 13:05:26 +01:00
2021-11-18 19:17:11 +01:00
2021-08-04 12:35:07 +01:00
2023-11-20 11:08:16 +01:00
2019-10-04 14:07:07 -07:00
2023-08-26 14:23:22 +02: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
c8f6b3b864