Abhishek Pandit-Subedi 20ae4089d0 Bluetooth: Only mark socket zapped after unlocking ... 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>		2020-09-13 09:46:00 +02:00
..
6lowpan	treewide: replace '---help---' in Kconfig files with 'help'	2020-06-14 01:57:21 +09:00
9p	net: 9p: kerneldoc fixes	2020-07-13 17:20:39 -07:00
802	net: 802: psnap.c: Use built-in RCU list checking	2020-02-24 13:02:53 -08:00
8021q	net: get rid of lockdep_set_class_and_subclass()	2020-06-28 21:37:23 -07:00
appletalk	net: make ->{get,set}sockopt in proto_ops optional	2020-07-19 18:16:41 -07:00
atm	net: pass a sockptr_t into ->setsockopt	2020-07-24 15:41:54 -07:00
ax25	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2020-07-25 17:49:04 -07:00
batman-adv	batman-adv: Introduce a configurable per interface hop penalty	2020-06-26 10:37:11 +02:00
bluetooth	Bluetooth: Only mark socket zapped after unlocking	2020-09-13 09:46:00 +02:00
bpf	bpf: Add tests for PTR_TO_BTF_ID vs. null comparison	2020-06-30 22:21:29 +02:00
bpfilter	bpfilter: switch bpfilter_ip_set_sockopt to sockptr_t	2020-07-24 15:41:54 -07:00
bridge	netfilter: switch nf_setsockopt to sockptr_t	2020-07-24 15:41:54 -07:00
caif	net: pass a sockptr_t into ->setsockopt	2020-07-24 15:41:54 -07:00
can	net: pass a sockptr_t into ->setsockopt	2020-07-24 15:41:54 -07:00
ceph	libceph: don't omit used_replica in target_copy()	2020-06-16 16:02:08 +02:00
core	fib: fix another fib_rules_ops indirect call wrapper problem	2020-08-01 11:47:39 -07:00
dcb	dcb_doit: remove redundant skb check	2020-06-23 20:27:09 -07:00
dccp	net: remove sockptr_advance	2020-07-28 13:43:40 -07:00
decnet	net: pass a sockptr_t into ->setsockopt	2020-07-24 15:41:54 -07:00
dns_resolver	docs: networking: convert dns_resolver.txt to ReST	2020-04-28 14:39:46 -07:00
dsa	net: dsa: stop overriding master's ndo_get_phys_port_name	2020-07-23 15:14:58 -07:00
ethernet	net: move devres helpers into a separate source file	2020-05-23 16:56:17 -07:00
ethtool	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2020-07-11 00:46:00 -07:00
hsr	hsr: Use %pM format specifier for MAC addresses	2020-07-31 16:46:26 -07:00
ieee802154	net: pass a sockptr_t into ->setsockopt	2020-07-24 15:41:54 -07:00
ife
ipv4	tcp: fix build fong CONFIG_MPTCP=n	2020-08-01 11:46:29 -07:00
ipv6	tcp: syncookies: create mptcp request socket for ACK cookies with MPTCP option	2020-07-31 16:55:32 -07:00
iucv	net: pass a sockptr_t into ->setsockopt	2020-07-24 15:41:54 -07:00
kcm	net: pass a sockptr_t into ->setsockopt	2020-07-24 15:41:54 -07:00
key	net: make ->{get,set}sockopt in proto_ops optional	2020-07-19 18:16:41 -07:00
l2tp	l2tp: improve API documentation in l2tp_core.h	2020-07-30 16:45:31 -07:00
l3mdev	l3mdev: add infrastructure for table to VRF mapping	2020-06-20 17:22:22 -07:00
lapb	treewide: replace '---help---' in Kconfig files with 'help'	2020-06-14 01:57:21 +09:00
llc	net: pass a sockptr_t into ->setsockopt	2020-07-24 15:41:54 -07:00
mac80211	mac80211: warn only once in check_sdata_in_driver() at each caller	2020-07-31 09:27:02 +02:00
mac802154	treewide: replace '---help---' in Kconfig files with 'help'	2020-06-14 01:57:21 +09:00
mpls	net: Removed the device type check to add mpls support for devices	2020-07-27 11:40:47 -07:00
mptcp	mptcp: fix syncookie build error on UP	2020-08-01 11:52:55 -07:00
ncsi	net/ncsi: use eth_zero_addr() to clear mac address	2020-07-23 11:49:41 -07:00
netfilter	net: remove sockptr_advance	2020-07-28 13:43:40 -07:00
netlabel	net: netlabel: kerneldoc fixes	2020-07-13 17:20:40 -07:00
netlink	net: pass a sockptr_t into ->setsockopt	2020-07-24 15:41:54 -07:00
netrom	net: pass a sockptr_t into ->setsockopt	2020-07-24 15:41:54 -07:00
nfc	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2020-07-25 17:49:04 -07:00
nsh	treewide: replace '---help---' in Kconfig files with 'help'	2020-06-14 01:57:21 +09:00
openvswitch	net: openvswitch: fixes potential deadlock in dp cleanup code	2020-07-24 16:58:38 -07:00
packet	net: pass a sockptr_t into ->setsockopt	2020-07-24 15:41:54 -07:00
phonet	net: pass a sockptr_t into ->setsockopt	2020-07-24 15:41:54 -07:00
psample	net: psample: fix build error when CONFIG_INET is not enabled	2020-05-23 16:36:05 -07:00
qrtr	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2020-07-25 17:49:04 -07:00
rds	net: pass a sockptr_t into ->setsockopt	2020-07-24 15:41:54 -07:00
rfkill	rfkill: Fix incorrect check to avoid NULL pointer dereference	2019-12-16 10:15:49 +01:00
rose	net: pass a sockptr_t into ->setsockopt	2020-07-24 15:41:54 -07:00
rxrpc	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2020-07-25 17:49:04 -07:00
sched	net/sched: cls_u32: Use struct_size() helper	2020-07-31 16:50:39 -07:00
sctp	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2020-07-25 17:49:04 -07:00
smc	net/smc: unique reason code for exceeded max dmb count	2020-07-27 10:30:01 -07:00
strparser
sunrpc	xprtrdma: fix incorrect header size calculations	2020-07-15 13:01:01 -04:00
switchdev	net: switchdev: kerneldoc fixes	2020-07-13 17:20:40 -07:00
tipc	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2020-07-25 17:49:04 -07:00
tls	net: remove sockptr_advance	2020-07-28 13:43:40 -07:00
unix	net: make ->{get,set}sockopt in proto_ops optional	2020-07-19 18:16:41 -07:00
vmw_vsock	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2020-07-25 17:49:04 -07:00
wimax
wireless	nl80211: support 4-way handshake offloading for WPA/WPA2-PSK in AP mode	2020-07-31 09:27:02 +02:00
x25	net: pass a sockptr_t into ->setsockopt	2020-07-24 15:41:54 -07:00
xdp	net: pass a sockptr_t into ->setsockopt	2020-07-24 15:41:54 -07:00
xfrm	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next	2020-07-30 14:39:31 -07:00
compat.c	net: remove compat_sys_{get,set}sockopt	2020-07-19 18:16:40 -07:00
devres.c	net: devres: rename the release callback of devm_register_netdev()	2020-06-30 15:57:34 -07:00
Kconfig	net: ethtool: Remove PHYLIB direct dependency	2020-07-07 15:41:05 -07:00
Makefile	net: move devres helpers into a separate source file	2020-05-23 16:56:17 -07:00
socket.c	net: improve the user pointer check in init_user_sockptr	2020-07-28 13:43:40 -07:00
sysctl_net.c