Eric Dumazet
32e9a9ee28
tcp: deny tcp_disconnect() when threads are waiting
...
[ Upstream commit 4faeee0cf8a5d88d63cdbc3bab124fb0e6aed08c ]
Historically connect(AF_UNSPEC) has been abused by syzkaller
and other fuzzers to trigger various bugs.
A recent one triggers a divide-by-zero [1], and Paolo Abeni
was able to diagnose the issue.
tcp_recvmsg_locked() has tests about sk_state being not TCP_LISTEN
and TCP REPAIR mode being not used.
Then later if socket lock is released in sk_wait_data(),
another thread can call connect(AF_UNSPEC), then make this
socket a TCP listener.
When recvmsg() is resumed, it can eventually call tcp_cleanup_rbuf()
and attempt a divide by 0 in tcp_rcv_space_adjust() [1]
This patch adds a new socket field, counting number of threads
blocked in sk_wait_event() and inet_wait_for_connect().
If this counter is not zero, tcp_disconnect() returns an error.
This patch adds code in blocking socket system calls, thus should
not hurt performance of non blocking ones.
Note that we probably could revert commit 499350a5a6e7 ("tcp:
initialize rcv_mss to TCP_MIN_MSS instead of 0") to restore
original tcpi_rcv_mss meaning (was 0 if no payload was ever
received on a socket)
[1]
divide error: 0000 [#1 ] PREEMPT SMP KASAN
CPU: 0 PID: 13832 Comm: syz-executor.5 Not tainted 6.3.0-rc4-syzkaller-00224-g00c7b5f4ddc5 #0
Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 03/02/2023
RIP: 0010:tcp_rcv_space_adjust+0x36e/0x9d0 net/ipv4/tcp_input.c:740
Code: 00 00 00 00 fc ff df 4c 89 64 24 48 8b 44 24 04 44 89 f9 41 81 c7 80 03 00 00 c1 e1 04 44 29 f0 48 63 c9 48 01 e9 48 0f af c1 <49> f7 f6 48 8d 04 41 48 89 44 24 40 48 8b 44 24 30 48 c1 e8 03 48
RSP: 0018:ffffc900033af660 EFLAGS: 00010206
RAX: 4a66b76cbade2c48 RBX: ffff888076640cc0 RCX: 00000000c334e4ac
RDX: 0000000000000000 RSI: dffffc0000000000 RDI: 0000000000000001
RBP: 00000000c324e86c R08: 0000000000000001 R09: 0000000000000000
R10: 0000000000000000 R11: 0000000000000000 R12: ffff8880766417f8
R13: ffff888028fbb980 R14: 0000000000000000 R15: 0000000000010344
FS: 00007f5bffbfe700(0000) GS:ffff8880b9800000(0000) knlGS:0000000000000000
CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033
CR2: 0000001b32f25000 CR3: 000000007ced0000 CR4: 00000000003506f0
DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000
DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400
Call Trace:
<TASK>
tcp_recvmsg_locked+0x100e/0x22e0 net/ipv4/tcp.c:2616
tcp_recvmsg+0x117/0x620 net/ipv4/tcp.c:2681
inet6_recvmsg+0x114/0x640 net/ipv6/af_inet6.c:670
sock_recvmsg_nosec net/socket.c:1017 [inline]
sock_recvmsg+0xe2/0x160 net/socket.c:1038
____sys_recvmsg+0x210/0x5a0 net/socket.c:2720
___sys_recvmsg+0xf2/0x180 net/socket.c:2762
do_recvmmsg+0x25e/0x6e0 net/socket.c:2856
__sys_recvmmsg net/socket.c:2935 [inline]
__do_sys_recvmmsg net/socket.c:2958 [inline]
__se_sys_recvmmsg net/socket.c:2951 [inline]
__x64_sys_recvmmsg+0x20f/0x260 net/socket.c:2951
do_syscall_x64 arch/x86/entry/common.c:50 [inline]
do_syscall_64+0x39/0xb0 arch/x86/entry/common.c:80
entry_SYSCALL_64_after_hwframe+0x63/0xcd
RIP: 0033:0x7f5c0108c0f9
Code: 28 00 00 00 75 05 48 83 c4 28 c3 e8 f1 19 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 b8 ff ff ff f7 d8 64 89 01 48
RSP: 002b:00007f5bffbfe168 EFLAGS: 00000246 ORIG_RAX: 000000000000012b
RAX: ffffffffffffffda RBX: 00007f5c011ac050 RCX: 00007f5c0108c0f9
RDX: 0000000000000001 RSI: 0000000020000bc0 RDI: 0000000000000003
RBP: 00007f5c010e7b39 R08: 0000000000000000 R09: 0000000000000000
R10: 0000000000000122 R11: 0000000000000246 R12: 0000000000000000
R13: 00007f5c012cfb1f R14: 00007f5bffbfe300 R15: 0000000000022000
</TASK>
Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2")
Reported-by: syzbot <syzkaller@googlegroups.com>
Reported-by: Paolo Abeni <pabeni@redhat.com>
Diagnosed-by: Paolo Abeni <pabeni@redhat.com>
Signed-off-by: Eric Dumazet <edumazet@google.com>
Tested-by: Paolo Abeni <pabeni@redhat.com>
Link: https://lore.kernel.org/r/20230526163458.2880232-1-edumazet@google.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
2023-06-09 10:28:53 +02:00
..
2019-05-30 11:29:21 -07:00
2022-08-03 11:59:37 +02:00
2021-06-10 13:37:09 +02:00
2023-05-30 12:44:08 +01:00
2021-12-08 09:01:12 +01:00
2021-12-01 09:23:35 +01:00
2019-06-05 17:37:07 +02:00
2023-03-11 16:44:11 +01:00
2022-05-18 09:47:25 +02:00
2021-03-04 10:26:53 +01:00
2022-08-03 11:59:39 +02:00
2019-05-30 11:26:41 -07:00
2020-09-09 19:12:23 +02:00
2019-02-28 08:24:23 -07:00
2019-06-05 17:37:05 +02:00
2022-04-15 14:18:33 +02:00
2022-04-20 09:19:39 +02:00
2019-06-19 17:09:55 +02:00
2022-02-23 11:59:58 +01:00
2021-12-14 14:49:00 +01:00
2019-07-04 12:30:48 -07:00
2023-05-30 12:44:09 +01:00
2019-08-17 23:18:54 +02:00
2022-09-05 10:27:42 +02:00
2019-05-21 11:28:45 +02:00
2019-06-19 17:09:55 +02:00
2021-06-03 08:59:01 +02:00
2019-05-30 11:26:41 -07:00
2022-03-02 11:41:08 +01:00
2019-05-21 11:28:45 +02:00
2019-05-30 11:26:32 -07:00
2019-04-19 14:07:40 -07:00
2019-05-30 11:29:52 -07:00
2019-05-30 11:29:52 -07:00
2019-11-09 19:38:36 -08:00
2019-05-21 11:52:39 +02:00
2019-05-21 11:52:39 +02:00
2020-05-27 17:46:24 +02:00
2019-09-16 21:32:57 +02:00
2022-02-16 12:52:51 +01:00
2020-01-04 19:18:58 +01:00
2023-01-18 11:41:37 +01:00
2022-07-12 16:30:45 +02:00
2019-06-19 17:09:55 +02:00
2019-04-22 21:50:53 -07:00
2021-12-08 09:01:13 +01:00
2022-04-20 09:19:34 +02:00
2019-12-18 16:08:47 +01:00
2020-09-26 18:03:12 +02:00
2019-11-08 09:11:49 +01:00
2019-10-23 20:13:22 -07:00
2020-07-22 09:32:46 +02:00
2019-03-22 12:09:31 -07:00
2018-12-10 15:53:04 -08:00
2019-07-01 10:58:23 -07:00
2019-10-25 16:24:32 -07:00
2021-03-04 10:26:53 +01:00
2019-02-22 12:56:24 -08:00
2022-10-26 13:22:59 +02:00
2022-06-14 18:11:25 +02:00
2019-04-22 21:50:53 -07:00
2019-05-30 11:26:32 -07:00
2019-05-30 11:26:32 -07:00
2019-05-30 11:26:32 -07:00
2019-07-03 13:51:54 -07:00
2021-03-30 14:35:26 +02:00
2020-12-08 10:40:25 +01:00
2022-01-27 09:19:54 +01:00
2022-06-06 08:33:49 +02:00
2022-07-29 17:14:11 +02:00
2019-09-27 12:05:02 +02:00
2019-02-08 21:50:15 -08:00
2019-05-30 11:26:32 -07:00
2022-02-01 17:24:38 +01:00
2021-08-12 13:20:57 +02:00
2023-05-30 12:44:05 +01:00
2021-12-08 09:01:12 +01:00
2023-05-30 12:44:05 +01:00
2020-08-19 08:16:10 +02:00
2023-06-05 08:17:33 +02:00
2022-01-27 09:19:54 +01:00
2021-12-01 09:23:33 +01:00
2023-04-26 11:24:05 +02:00
2020-02-11 04:35:48 -08:00
2019-06-19 17:09:55 +02:00
2019-05-30 11:26:32 -07:00
2019-10-08 13:23:05 -07:00
2021-08-04 12:27:39 +02:00
2021-11-17 09:48:47 +01:00
2019-04-23 19:42:29 -07:00
2020-04-29 16:33:18 +02:00
2019-05-30 11:26:41 -07:00
2019-05-21 11:28:45 +02:00
2019-06-05 17:36:38 +02:00
2019-06-05 17:36:38 +02:00
2023-01-18 11:41:37 +01:00
2019-12-31 16:45:03 +01:00
2021-11-17 09:48:49 +01:00
2021-06-23 14:41:25 +02:00
2019-05-21 11:28:45 +02:00
2019-08-13 20:37:16 -07:00
2019-05-30 11:26:32 -07:00
2019-04-11 13:59:49 -07:00
2021-10-06 15:42:33 +02:00
2021-12-01 09:23:32 +01:00
2021-05-19 10:08:31 +02:00
2019-05-30 11:26:32 -07:00
2020-02-01 09:34:38 +00:00
2021-10-17 10:42:34 +02:00
2022-11-10 17:57:55 +01:00
2021-08-18 08:56:59 +02:00
2022-07-21 20:59:22 +02:00
2021-04-14 08:24:14 +02:00
2019-10-09 21:34:31 -07:00
2022-02-01 17:24:39 +01:00
2021-03-30 14:35:29 +02:00
2019-04-22 21:47:25 -07:00
2023-02-06 07:52:37 +01:00
2023-05-17 11:35:41 +02:00
2022-06-06 08:33:49 +02:00
2019-05-30 11:26:32 -07:00
2019-05-30 11:26:32 -07:00
2019-05-30 11:26:32 -07:00
2019-02-21 10:34:37 -08:00
2019-05-30 11:26:32 -07:00
2019-09-16 09:02:18 +02:00
2023-06-09 10:28:53 +02:00
2021-11-17 09:48:48 +01:00
2019-05-30 11:26:32 -07:00
2019-05-30 11:26:32 -07:00
2022-11-10 17:57:55 +01:00
2019-05-30 11:26:32 -07:00
2021-11-02 19:46:12 +01:00
2022-04-15 14:18:01 +02:00
2023-04-26 11:24:05 +02:00
2023-04-26 11:24:05 +02:00
2019-06-05 17:37:05 +02:00
2019-10-24 14:53:49 -07:00
2019-06-05 17:30:29 +02:00
2019-12-18 16:09:07 +01:00
2019-08-31 01:08:26 +02:00
2019-06-19 11:23:13 -04:00
2022-03-19 13:40:16 +01:00