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
..
6lowpan	6lowpan: no need to check return value of debugfs_create functions	2019-07-06 12:50:01 +02:00
9p	net/9p: validate fds in p9_fd_open	2020-08-11 15:33:36 +02:00
802	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 500	2019-06-19 17:09:55 +02:00
8021q	vlan: vlan_changelink() should propagate errors	2020-01-12 12:21:50 +01:00
appletalk	appletalk: Fix atalk_proc_init() return path	2020-08-11 15:33:40 +02:00
atm	atm: fix a memory leak of vcc->user_back	2020-10-01 13:17:58 +02:00
ax25	AX.25: Prevent integer overflows in connect and sendmsg	2020-07-31 18:39:31 +02:00
batman-adv	batman-adv: mcast: fix duplicate mcast packets from BLA backbone to mesh	2020-10-01 13:18:19 +02:00
bluetooth	Bluetooth: Only mark socket zapped after unlocking	2020-10-29 09:58:06 +01:00
bpf	bpf/flow_dissector: support flags in BPF_PROG_TEST_RUN	2019-07-25 18:00:41 -07:00
bpfilter	net/bpfilter: remove superfluous testing message	2020-04-21 09:04:53 +02:00
bridge	netfilter: ebtables: Fixes dropping of small packets in bridge nat	2020-10-29 09:57:57 +01:00
caif	net: use skb_queue_empty_lockless() in poll() handlers	2019-10-28 13:33:41 -07:00
can	net: j1939: j1939_session_fresh_new(): fix missing initialization of skbcnt	2020-10-29 09:57:24 +01:00
ceph	libceph: don't omit recovery_deletes in target_copy()	2020-07-22 09:33:17 +02:00
core	net: Properly typecast int values to set sk_max_pacing_rate	2020-10-29 09:57:26 +01:00
dcb	net: DCB: Validate DCB_ATTR_DCB_BUFFER argument	2020-09-26 18:03:12 +02:00
dccp	dccp: Fix possible memleak in dccp_init and dccp_fini	2020-06-17 16:40:32 +02:00
decnet	net: add bool confirm_neigh parameter for dst_ops.update_pmtu	2020-01-04 19:18:58 +01:00
dns_resolver	KEYS: Don't write out to userspace while holding key semaphore	2020-04-23 10:36:45 +02:00
dsa	dsa: Allow forwarding of redirected IGMP traffic	2020-09-23 12:40:33 +02:00
ethernet	net: add annotations on hh->hh_len lockless accesses	2020-01-09 10:20:06 +01:00
hsr	hsr: check protocol version in hsr_newlink()	2020-04-21 09:04:44 +02:00
ieee802154	nl802154: add missing attribute validation for dev_type	2020-03-18 07:17:44 +01:00
ife	net: Fix Kconfig indentation	2019-09-26 08:56:17 +02:00
ipv4	ip_gre: set dev->hard_header_len and dev->needed_headroom properly	2020-10-29 09:58:04 +01:00
ipv6	netfilter: nf_log: missing vlan offload tag and proto	2020-10-29 09:57:45 +01:00
iucv	net/af_iucv: mark expected switch fall-throughs	2019-07-29 10:26:14 -07:00
kcm	kcm: disable preemption in kcm_parse_func_strparser()	2019-09-27 10:27:14 +02:00
key	af_key: pfkey_dump needs parameter validation	2020-09-26 18:03:10 +02:00
l2tp	l2tp: remove skb_dst_set() from l2tp_xmit_skb()	2020-07-22 09:32:47 +02:00
l3mdev	ipv6: convert major tx path to use RT6_LOOKUP_F_DST_NOREF	2019-06-23 13:24:17 -07:00
lapb	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2019-06-17 20:20:36 -07:00
llc	net: silence data-races on sk_backlog.tail	2020-10-01 13:17:15 +02:00
mac80211	mac80211: handle lack of sband->bitrates in rates	2020-10-29 09:58:04 +01:00
mac802154	mac802154: tx: fix use-after-free	2020-10-01 13:18:17 +02:00
mpls	net: ipv6_stub: use ip6_dst_lookup_flow instead of ip6_dst_lookup	2019-12-18 16:08:42 +01:00
ncsi	net/ncsi: Disable global multicast filter	2019-09-19 18:04:40 -07:00
netfilter	netfilter: nf_fwd_netdev: clear timestamp in forwarding path	2020-10-29 09:57:57 +01:00
netlabel	netlabel: fix problems with mapping removal	2020-09-12 14:18:55 +02:00
netlink	genetlink: remove genl_bind	2020-07-22 09:32:46 +02:00
netrom	net: netrom: Fix potential nr_neigh refcnt leak in nr_add_node	2020-04-29 16:33:08 +02:00
nfc	nfc: Ensure presence of NFC_ATTR_FIRMWARE_NAME attribute in nfc_genl_fw_download()	2020-10-29 09:57:26 +01:00
nsh	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 500	2019-06-19 17:09:55 +02:00
openvswitch	openvswitch: handle DNAT tuple collision	2020-10-14 10:33:02 +02:00
packet	net/packet: fix overflow in tpacket_rcv	2020-09-09 19:12:29 +02:00
phonet	net: use skb_queue_empty_lockless() in poll() handlers	2019-10-28 13:33:41 -07:00
psample	net: psample: fix skb_over_panic	2019-12-04 22:30:54 +01:00
qrtr	net: qrtr: check skb_put_padto() return value	2020-09-26 18:03:15 +02:00
rds	rds: Prevent kernel-infoleak in rds_notify_queue_get()	2020-08-05 09:59:44 +02:00
rfkill	rfkill: Fix incorrect check to avoid NULL pointer dereference	2020-01-12 12:21:33 +01:00
rose	net: core: add generic lockdep keys	2019-10-24 14:53:48 -07:00
rxrpc	rxrpc: Fix server keyring leak	2020-10-14 10:33:05 +02:00
sched	net/sched: act_tunnel_key: fix OOB write in case of IPv6 ERSPAN tunnels	2020-10-29 09:57:26 +01:00
sctp	sctp: fix sctp_auth_init_hmacs() error path	2020-10-14 10:33:01 +02:00
smc	net/smc: fix valid DMBE buffer sizes	2020-10-29 09:57:23 +01:00
strparser	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2019-06-22 08:59:24 -04:00
sunrpc	SUNRPC: fix copying of multiple pages in gss_read_proxy_verf()	2020-10-29 09:57:56 +01:00
switchdev	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 152	2019-05-30 11:26:32 -07:00
tipc	tipc: fix the skb_unshare() in tipc_buf_append()	2020-10-29 09:57:24 +01:00
tls	net/tls: sendfile fails with ktls offload	2020-10-29 09:57:23 +01:00
unix	skbuff: fix a data race in skb_queue_len()	2020-10-01 13:17:31 +02:00
vmw_vsock	net: virtio_vsock: Enhance connection semantics	2020-10-07 08:01:24 +02:00
wimax	wimax: no need to check return value of debugfs_create functions	2019-08-10 15:25:47 -07:00
wireless	nl80211: fix non-split wiphy information	2020-10-29 09:57:44 +01:00
x25	net/x25: Fix null-ptr-deref in x25_disconnect	2020-08-05 09:59:44 +02:00
xdp	xdp: Fix xsk_generic_xmit errno	2020-06-24 17:50:44 +02:00
xfrm	xfrm: Use correct address family in xfrm_state_find	2020-10-14 10:33:03 +02:00
Kconfig	net: Fix CONFIG_NET_CLS_ACT=n and CONFIG_NFT_FWD_NETDEV={y, m} build	2020-04-01 11:02:18 +02:00
Makefile	…
compat.c	net/compat: Add missing sock updates for SCM_RIGHTS	2020-08-21 13:05:25 +02:00
socket.c	net: Set fput_needed iff FDPUT_FPUT is set	2020-08-19 08:16:22 +02:00
sysctl_net.c	…