Abhishek Pandit-Subedi bab673eef8 Bluetooth: Only mark socket zapped after unlocking ... [ Upstream commit 20ae4089d0 ] Since l2cap_sock_teardown_cb doesn't acquire the channel lock before setting the socket as zapped, it could potentially race with l2cap_sock_release which frees the socket. Thus, wait until the cleanup is complete before marking the socket as zapped. This race was reproduced on a JBL GO speaker after the remote device rejected L2CAP connection due to resource unavailability. Here is a dmesg log with debug logs from a repro of this bug: [ 3465.424086] Bluetooth: hci_core.c:hci_acldata_packet() hci0 len 16 handle 0x0003 flags 0x0002 [ 3465.424090] Bluetooth: hci_conn.c:hci_conn_enter_active_mode() hcon 00000000cfedd07d mode 0 [ 3465.424094] Bluetooth: l2cap_core.c:l2cap_recv_acldata() conn 000000007eae8952 len 16 flags 0x2 [ 3465.424098] Bluetooth: l2cap_core.c:l2cap_recv_frame() len 12, cid 0x0001 [ 3465.424102] Bluetooth: l2cap_core.c:l2cap_raw_recv() conn 000000007eae8952 [ 3465.424175] Bluetooth: l2cap_core.c:l2cap_sig_channel() code 0x03 len 8 id 0x0c [ 3465.424180] Bluetooth: l2cap_core.c:l2cap_connect_create_rsp() dcid 0x0045 scid 0x0000 result 0x02 status 0x00 [ 3465.424189] Bluetooth: l2cap_core.c:l2cap_chan_put() chan 000000006acf9bff orig refcnt 4 [ 3465.424196] Bluetooth: l2cap_core.c:l2cap_chan_del() chan 000000006acf9bff, conn 000000007eae8952, err 111, state BT_CONNECT [ 3465.424203] Bluetooth: l2cap_sock.c:l2cap_sock_teardown_cb() chan 000000006acf9bff state BT_CONNECT [ 3465.424221] Bluetooth: l2cap_core.c:l2cap_chan_put() chan 000000006acf9bff orig refcnt 3 [ 3465.424226] Bluetooth: hci_core.h:hci_conn_drop() hcon 00000000cfedd07d orig refcnt 6 [ 3465.424234] BUG: spinlock bad magic on CPU#2, kworker/u17:0/159 [ 3465.425626] Bluetooth: hci_sock.c:hci_sock_sendmsg() sock 000000002bb0cb64 sk 00000000a7964053 [ 3465.430330] lock: 0xffffff804410aac0, .magic: 00000000, .owner: <none>/-1, .owner_cpu: 0 [ 3465.430332] Causing a watchdog bite! Signed-off-by: Abhishek Pandit-Subedi <abhishekpandit@chromium.org> Reported-by: Balakrishna Godavarthi <bgodavar@codeaurora.org> Reviewed-by: Manish Mandlik <mmandlik@chromium.org> Signed-off-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Sasha Levin <sashal@kernel.org>		2020-10-29 09:58:06 +01:00
..
bnep	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 234	2019-06-19 17:09:07 +02:00
cmtp	treewide: Add SPDX license identifier - Makefile/Kconfig	2019-05-21 10:50:46 +02:00
hidp	Bluetooth: hidp: Fix assumptions on the return value of hidp_send_message	2019-09-06 15:55:40 +02:00
rfcomm	Bluetooth: RFCOMM: fix ODEBUG bug in rfcomm_dev_ioctl	2020-04-13 10:48:13 +02:00
6lowpan.c	Bluetooth: add a mutex lock to avoid UAF in do_enale_set	2020-08-19 08:15:59 +02:00
Kconfig	bluetooth: switch to AES library	2019-07-26 14:58:12 +10:00
Makefile	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
a2mp.c	Bluetooth: A2MP: Fix not initializing all members	2020-10-17 10:11:22 +02:00
a2mp.h	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 284	2019-06-05 17:36:37 +02:00
af_bluetooth.c	net: use skb_queue_empty_lockless() in poll() handlers	2019-10-28 13:33:41 -07:00
amp.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 284	2019-06-05 17:36:37 +02:00
amp.h	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 284	2019-06-05 17:36:37 +02:00
ecdh_helper.c	Bluetooth: let the crypto subsystem generate the ecc privkey	2017-10-06 20:35:47 +02:00
ecdh_helper.h	Bluetooth: let the crypto subsystem generate the ecc privkey	2017-10-06 20:35:47 +02:00
hci_conn.c	Bluetooth: Disconnect if E0 is used for Level 4	2020-10-17 10:11:22 +02:00
hci_core.c	Bluetooth: Allow combination of BDADDR_PROPERTY and INVALID_BDADDR quirks	2020-02-01 09:34:50 +00:00
hci_debugfs.c	Bluetooth: Add debug setting for changing minimum encryption key size	2019-08-17 13:54:40 +03:00
hci_debugfs.h	Bluetooth: Provide option to enable/disable debugfs information	2015-02-15 18:54:13 +02:00
hci_event.c	Bluetooth: Disconnect if E0 is used for Level 4	2020-10-17 10:11:22 +02:00
hci_request.c	Bluetooth: Fix advertising duplicated flags	2019-12-31 16:44:33 +01:00
hci_request.h	Bluetooth: Use controller sets when available	2019-07-06 15:38:18 +02:00
hci_sock.c	Bluetooth: Fix race condition in hci_release_sock()	2020-02-05 21:22:42 +00:00
hci_sysfs.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-11-04 09:26:51 +09:00
l2cap_core.c	Bluetooth: L2CAP: Fix calling sk_filter on non-socket based channel	2020-10-17 10:11:22 +02:00
l2cap_sock.c	Bluetooth: Only mark socket zapped after unlocking	2020-10-29 09:58:06 +01:00
leds.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 500	2019-06-19 17:09:55 +02:00
leds.h	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 500	2019-06-19 17:09:55 +02:00
lib.c	Bluetooth: make baswap src const	2017-09-01 22:49:47 +02:00
mgmt.c	Bluetooth: MGMT: Fix not checking if BT_HS is enabled	2020-10-17 10:11:22 +02:00
mgmt_util.c	networking: make skb_push & __skb_push return void pointers	2017-06-16 11:48:40 -04:00
mgmt_util.h	Bluetooth: Add generic mgmt helper API	2015-03-17 18:03:08 +01:00
sco.c	net: rework SIOCGSTAMP ioctl handling	2019-04-19 14:07:40 -07:00
selftest.c	Bluetooth: Fix compiler warning with selftest duration calculation	2017-10-06 21:49:13 +03:00
selftest.h	Bluetooth: Add support for self testing framework	2014-12-30 08:53:55 +02:00
smp.c	bluetooth: switch to AES library	2019-07-26 14:58:12 +10:00
smp.h	Bluetooth: SMP: fix crash in unpairing	2018-09-26 12:39:32 +03:00