|
Takashi Iwai |
0ff255 |
From 3af70b39fa2d415dc86c370e5b24ddb9fdacbd6f Mon Sep 17 00:00:00 2001
|
|
Takashi Iwai |
0ff255 |
From: Archie Pusaka <apusaka@chromium.org>
|
|
Takashi Iwai |
0ff255 |
Date: Tue, 23 Mar 2021 16:32:20 +0800
|
|
Takashi Iwai |
0ff255 |
Subject: [PATCH] Bluetooth: check for zapped sk before connecting
|
|
Takashi Iwai |
0ff255 |
Git-commit: 3af70b39fa2d415dc86c370e5b24ddb9fdacbd6f
|
|
Takashi Iwai |
0ff255 |
Patch-mainline: v5.13-rc1
|
|
Takashi Iwai |
0ff255 |
References: git-fixes
|
|
Takashi Iwai |
0ff255 |
|
|
Takashi Iwai |
0ff255 |
There is a possibility of receiving a zapped sock on
|
|
Takashi Iwai |
0ff255 |
l2cap_sock_connect(). This could lead to interesting crashes, one
|
|
Takashi Iwai |
0ff255 |
such case is tearing down an already tore l2cap_sock as is happened
|
|
Takashi Iwai |
0ff255 |
with this call trace:
|
|
Takashi Iwai |
0ff255 |
|
|
Takashi Iwai |
0ff255 |
__dump_stack lib/dump_stack.c:15 [inline]
|
|
Takashi Iwai |
0ff255 |
dump_stack+0xc4/0x118 lib/dump_stack.c:56
|
|
Takashi Iwai |
0ff255 |
register_lock_class kernel/locking/lockdep.c:792 [inline]
|
|
Takashi Iwai |
0ff255 |
register_lock_class+0x239/0x6f6 kernel/locking/lockdep.c:742
|
|
Takashi Iwai |
0ff255 |
__lock_acquire+0x209/0x1e27 kernel/locking/lockdep.c:3105
|
|
Takashi Iwai |
0ff255 |
lock_acquire+0x29c/0x2fb kernel/locking/lockdep.c:3599
|
|
Takashi Iwai |
0ff255 |
__raw_spin_lock_bh include/linux/spinlock_api_smp.h:137 [inline]
|
|
Takashi Iwai |
0ff255 |
_raw_spin_lock_bh+0x38/0x47 kernel/locking/spinlock.c:175
|
|
Takashi Iwai |
0ff255 |
spin_lock_bh include/linux/spinlock.h:307 [inline]
|
|
Takashi Iwai |
0ff255 |
lock_sock_nested+0x44/0xfa net/core/sock.c:2518
|
|
Takashi Iwai |
0ff255 |
l2cap_sock_teardown_cb+0x88/0x2fb net/bluetooth/l2cap_sock.c:1345
|
|
Takashi Iwai |
0ff255 |
l2cap_chan_del+0xa3/0x383 net/bluetooth/l2cap_core.c:598
|
|
Takashi Iwai |
0ff255 |
l2cap_chan_close+0x537/0x5dd net/bluetooth/l2cap_core.c:756
|
|
Takashi Iwai |
0ff255 |
l2cap_chan_timeout+0x104/0x17e net/bluetooth/l2cap_core.c:429
|
|
Takashi Iwai |
0ff255 |
process_one_work+0x7e3/0xcb0 kernel/workqueue.c:2064
|
|
Takashi Iwai |
0ff255 |
worker_thread+0x5a5/0x773 kernel/workqueue.c:2196
|
|
Takashi Iwai |
0ff255 |
kthread+0x291/0x2a6 kernel/kthread.c:211
|
|
Takashi Iwai |
0ff255 |
ret_from_fork+0x4e/0x80 arch/x86/entry/entry_64.S:604
|
|
Takashi Iwai |
0ff255 |
|
|
Takashi Iwai |
0ff255 |
Signed-off-by: Archie Pusaka <apusaka@chromium.org>
|
|
Takashi Iwai |
0ff255 |
Reported-by: syzbot+abfc0f5e668d4099af73@syzkaller.appspotmail.com
|
|
Takashi Iwai |
0ff255 |
Reviewed-by: Alain Michaud <alainm@chromium.org>
|
|
Takashi Iwai |
0ff255 |
Reviewed-by: Abhishek Pandit-Subedi <abhishekpandit@chromium.org>
|
|
Takashi Iwai |
0ff255 |
Reviewed-by: Guenter Roeck <groeck@chromium.org>
|
|
Takashi Iwai |
0ff255 |
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
|
|
Takashi Iwai |
0ff255 |
Acked-by: Takashi Iwai <tiwai@suse.de>
|
|
Takashi Iwai |
0ff255 |
|
|
Takashi Iwai |
0ff255 |
---
|
|
Takashi Iwai |
0ff255 |
net/bluetooth/l2cap_sock.c | 8 ++++++++
|
|
Takashi Iwai |
0ff255 |
1 file changed, 8 insertions(+)
|
|
Takashi Iwai |
0ff255 |
|
|
Takashi Iwai |
0ff255 |
diff --git a/net/bluetooth/l2cap_sock.c b/net/bluetooth/l2cap_sock.c
|
|
Takashi Iwai |
0ff255 |
index f1b1edd0b697..c99d65ef13b1 100644
|
|
Takashi Iwai |
0ff255 |
--- a/net/bluetooth/l2cap_sock.c
|
|
Takashi Iwai |
0ff255 |
+++ b/net/bluetooth/l2cap_sock.c
|
|
Takashi Iwai |
0ff255 |
@@ -179,9 +179,17 @@ static int l2cap_sock_connect(struct socket *sock, struct sockaddr *addr,
|
|
Takashi Iwai |
0ff255 |
struct l2cap_chan *chan = l2cap_pi(sk)->chan;
|
|
Takashi Iwai |
0ff255 |
struct sockaddr_l2 la;
|
|
Takashi Iwai |
0ff255 |
int len, err = 0;
|
|
Takashi Iwai |
0ff255 |
+ bool zapped;
|
|
Takashi Iwai |
0ff255 |
|
|
Takashi Iwai |
0ff255 |
BT_DBG("sk %p", sk);
|
|
Takashi Iwai |
0ff255 |
|
|
Takashi Iwai |
0ff255 |
+ lock_sock(sk);
|
|
Takashi Iwai |
0ff255 |
+ zapped = sock_flag(sk, SOCK_ZAPPED);
|
|
Takashi Iwai |
0ff255 |
+ release_sock(sk);
|
|
Takashi Iwai |
0ff255 |
+
|
|
Takashi Iwai |
0ff255 |
+ if (zapped)
|
|
Takashi Iwai |
0ff255 |
+ return -EINVAL;
|
|
Takashi Iwai |
0ff255 |
+
|
|
Takashi Iwai |
0ff255 |
if (!addr || alen < offsetofend(struct sockaddr, sa_family) ||
|
|
Takashi Iwai |
0ff255 |
addr->sa_family != AF_BLUETOOTH)
|
|
Takashi Iwai |
0ff255 |
return -EINVAL;
|
|
Takashi Iwai |
0ff255 |
--
|
|
Takashi Iwai |
0ff255 |
2.26.2
|
|
Takashi Iwai |
0ff255 |
|