Daniel Borkmann
fcacaa9d04
bpf, sockmap: Revert buggy deadlock fix in the sockhash and sockmap ...
[ Upstream commit 8c5c2a4898e3d6bad86e29d471e023c8a19ba799 ]
syzbot reported a splat and bisected it to recent commit ed17aa92dc56 ("bpf,
sockmap: fix deadlocks in the sockhash and sockmap"):
[...]
WARNING: CPU: 1 PID: 9280 at kernel/softirq.c:376 __local_bh_enable_ip+0xbe/0x130 kernel/softirq.c:376
Modules linked in:
CPU: 1 PID: 9280 Comm: syz-executor.1 Not tainted 6.2.0-syzkaller-13249-gd319f344561d #0
Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 03/30/2023
RIP: 0010:__local_bh_enable_ip+0xbe/0x130 kernel/softirq.c:376
[...]
Call Trace:
<TASK>
spin_unlock_bh include/linux/spinlock.h:395 [inline]
sock_map_del_link+0x2ea/0x510 net/core/sock_map.c:165
sock_map_unref+0xb0/0x1d0 net/core/sock_map.c:184
sock_hash_delete_elem+0x1ec/0x2a0 net/core/sock_map.c:945
map_delete_elem kernel/bpf/syscall.c:1536 [inline]
__sys_bpf+0x2edc/0x53e0 kernel/bpf/syscall.c:5053
__do_sys_bpf kernel/bpf/syscall.c:5166 [inline]
__se_sys_bpf kernel/bpf/syscall.c:5164 [inline]
__x64_sys_bpf+0x79/0xc0 kernel/bpf/syscall.c:5164
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:0x7fe8f7c8c169
</TASK>
[...]
Revert for now until we have a proper solution.
Fixes: ed17aa92dc56 ("bpf, sockmap: fix deadlocks in the sockhash and sockmap")
Reported-by: syzbot+49f6cef45247ff249498@syzkaller.appspotmail.com
Cc: Hsin-Wei Hung <hsinweih@uci.edu>
Cc: Xin Liu <liuxin350@huawei.com>
Cc: John Fastabend <john.fastabend@gmail.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Link: https://lore.kernel.org/bpf/000000000000f1db9605f939720e@google.com/
Signed-off-by: Sasha Levin <sashal@kernel.org>
2023-05-17 11:47:52 +02:00
2021-09-15 09:50:34 +02:00
2023-04-20 12:10:25 +02:00
2023-01-14 10:16:18 +01:00
2023-05-17 11:47:47 +02:00
2021-04-07 15:00:08 +02:00
2022-10-30 09:41:16 +01:00
2022-06-22 14:13:17 +02:00
2022-05-18 10:23:42 +02:00
2023-05-17 11:47:30 +02:00
2023-01-14 10:15:31 +01:00
2021-07-14 16:56:29 +02:00
2023-04-26 11:27:34 +02:00
2023-03-17 08:45:11 +01:00
2023-04-20 12:10:23 +02:00
2022-05-25 09:17:56 +02:00
2023-05-17 11:47:52 +02:00
2022-03-08 19:09:37 +01:00
2023-04-26 11:27:42 +02:00
2022-08-31 17:15:19 +02:00
2022-12-14 11:32:01 +01:00
2023-01-24 07:19:55 +01:00
2023-04-05 11:23:52 +02:00
2022-11-03 23:57:51 +09:00
2023-04-26 11:27:41 +02:00
2023-04-26 11:27:42 +02:00
2023-03-22 13:30:00 +01:00
2022-11-25 17:45:56 +01:00
2022-12-02 17:39:58 +01:00
2023-04-26 11:27:41 +02:00
2022-04-27 13:53:50 +02:00
2021-02-10 09:29:14 +01:00
2022-03-28 09:57:10 +02:00
2023-04-20 12:10:21 +02:00
2022-12-14 11:32:01 +01:00
2023-02-22 12:55:58 +01:00
2023-04-26 11:27:41 +02:00
2022-01-05 12:40:32 +01:00
2023-03-22 13:29:57 +01:00
2022-04-13 21:01:00 +02:00
2023-02-01 08:23:24 +01:00
2023-02-15 17:22:12 +01:00
2023-03-17 08:45:07 +01:00
2023-02-22 12:55:57 +01:00
2023-05-17 11:47:48 +02:00
2022-01-11 15:25:01 +01:00
2021-03-07 12:34:07 +01:00
2023-04-20 12:10:26 +02:00
2023-03-11 16:39:26 +01:00
2023-02-22 12:55:53 +01:00
2023-01-14 10:16:12 +01:00
2023-04-26 11:27:34 +02:00
2023-04-26 11:27:42 +02:00
2023-03-22 13:29:58 +01:00
2021-11-18 14:04:27 +01:00
2023-04-20 12:10:22 +02:00
2021-02-07 15:37:12 +01:00
2023-01-18 11:44:58 +01:00
2023-04-05 11:23:31 +02:00
2022-12-14 11:32:01 +01:00
2023-01-14 10:15:42 +01:00
2023-03-13 10:19:36 +01:00
2023-02-15 17:22:15 +01:00
2023-05-17 11:47:50 +02:00
2023-03-22 13:29:55 +01:00
2021-06-18 10:00:06 +02:00
2023-01-04 11:39:24 +01:00
fcacaa9d04