From nobody Tue Jun 16 10:11:11 2026 Received: from mail-pl1-f171.google.com (mail-pl1-f171.google.com [209.85.214.171]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id BF7422EAB6F for ; Sat, 18 Apr 2026 05:34:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.171 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776490466; cv=none; b=D9vxyOBx/1wq5tYrYDXEYGh+DvLFH1PGdHV0O8a/n6FSYTFzhoAYhhDdhWM6FV//v3qDJ8iyPCHyFIhEF+nwHuh8AXStHjXOb47KrQzRkACBSz2pG9TGaaB+qkVN/5Ks/Ddw/lYk37171L2yj2ykUtWsn+IX1x/3Bd11ECsG+W0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776490466; c=relaxed/simple; bh=C6Hn3L10r5uhLd2QzSnPaJi2BVQnAFECz4DQWvB6GuE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=dBabOm2wBc7GSdaGz7Okiuap4rUiOh8zF/au4VChxH2z0E7fj2RL89Ezv/vduXuwbTTVddpmI5jdZwzsTD987bCvQhxgXPJp+fggguhG0WrOCjZazxaY27SRet4jrZZRwrmT/7uKOODxX3aPs3FKUFUTEha/MrzV8dGAQh6x7ls= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=Wj2AV8xO; arc=none smtp.client-ip=209.85.214.171 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Wj2AV8xO" Received: by mail-pl1-f171.google.com with SMTP id d9443c01a7336-2ad9516a653so7195005ad.0 for ; Fri, 17 Apr 2026 22:34:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1776490465; x=1777095265; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=aTLB8mgGvaT9B2aXVBnKEZE3IH4dRJ493bKxw7Qh57M=; b=Wj2AV8xOZwiGNnzUlzPLyXKgzP7N5Lfs66P+JzI0V1unT/jWACx2l8I18X+upPDTF/ cKF16UalLUvU3o35mime47e2bYL5/QUkS2Pi4SUOvWvv1tbDCgmHAU/duNEdK5xTgK7n itYXRxEQUE+9OcLEZFoE95JHkdyuamtrs3JlB8a1Yky2in1r4l4rjlX0hiZXgt6h3VoP 3cjdBQxQlQvNbUZDNJTTuj70J2fev3u3rFbz/wCjyCxWb6wG2gun7i1M/Q151jtS3c9p r2k2R8DO9unv0ME3keb4GAyB9CiczzEO4K30yPTt9ZNC1UWv28+a6Qj+25r9NicYLigw cyIA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1776490465; x=1777095265; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=aTLB8mgGvaT9B2aXVBnKEZE3IH4dRJ493bKxw7Qh57M=; b=JxAt2fULw9GgMGj8SG9IYEyf0mgaavXD6gAG22cjCYPF8A9weJrqARCWuGjVpcE9ZZ epY9NlEb98DiyGNjJ0c1J3b7HwVeTTlkCkN6Mnp75KSkJZya/q03Ox9a1eIq055/Ykah 0EasNt0CoRI0KqRgsG1+lySv5G0EiphHsDjsEQAv4qoTRDqFSpotSDqsY5dBzG3l1Q6v 0Yem5IvYoCkYTaFCpzucBGTsHoyUr00XbEQgeBE1688Us0xY5FdgFda1MZ2KAXBM/EBB Viu0SfJZh+opnIP1f2vhiJbwfYNvrmXOIDEZxtncnPcdKPI4LCfOqCjYLymSKqmoEwY+ GXrg== X-Forwarded-Encrypted: i=1; AFNElJ9Hje03Wfq5Or0LTkaFjVMQOY/jvS8hyvZPVoQ86yOmwUSqARr2+PhmQqOXBSZPx2Z39Pl3wE8Zheizu/U=@vger.kernel.org X-Gm-Message-State: AOJu0YyxAy/+Kzm6ctUohKEk3Eg/XqHYdeNlkLhI/f/RscnVk34y4+Fo E09OwOWI1vHqEB6HTLFLRMY8RNK5klJXLC+olWPk02ltCnkwPZMbbE4Y X-Gm-Gg: AeBDieuB4aDlOwBW6TorPdJIAeOpxlmYxsHrYwz/GaZYDodGVCaP164pZVek69RrxUo na3NS+Vft6n6K/o+IiyEQ5iEsnMyDY3uZBTYqnrgWBfekRHueUPa7GUgo30V7Pp5iFRpu8XiUfK Q9Qvmn1mpVxXMpbpsoZL+iJSgLNlIKPVFTeeeMWxyoXkY4rrHpLj3celefX7Xqzv0TIVUBs7VdU cHxr1a8l5+chFx7a5uKSjMwUP71iTfQhCgHQgQA6VtfrKzro26Ny+uxLzyCqSqNIiTetFX5ccEI zZBK4pg1Fr34ebUWWnquy1A3qFLQa4C1CHjxhaBLxu9a79hla66NTdiCyJrEsmpqF/y9udfJftx g5mbuVmgxjzGL+LFtsAe65isIB4uT76hG/eb9S9WsyjUfbBUUpR5gEmlPV2hDwxoJk/N0Gs+qrE PXuW2RjA5TKCF6VFxyJ1k3/4/Str8RjGzPeDOk4Ptp1pMlb72/wjtEPxe0PEapPzb7G/3X X-Received: by 2002:a17:902:cf4a:b0:2b0:4b3a:9b4d with SMTP id d9443c01a7336-2b5f9f1c862mr62346035ad.20.1776490465079; Fri, 17 Apr 2026 22:34:25 -0700 (PDT) Received: from fedora ([61.74.238.173]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2b5fa9ff3bfsm46251885ad.7.2026.04.17.22.34.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Apr 2026 22:34:24 -0700 (PDT) From: SeungJu Cheon To: luiz.dentz@gmail.com, marcel@holtmann.org Cc: linux-bluetooth@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, me@brighamcampbell.com, skhan@linuxfoundation.org, linux-kernel-mentees@lists.linux.dev, SeungJu Cheon Subject: [PATCH 1/2] Bluetooth: ISO: Fix data-race on dst in iso_sock_connect() Date: Sat, 18 Apr 2026 14:34:00 +0900 Message-ID: <20260418053401.128483-2-suunj1331@gmail.com> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260418053401.128483-1-suunj1331@gmail.com> References: <20260418053401.128483-1-suunj1331@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" iso_sock_connect() copies the destination address into iso_pi(sk)->dst under lock_sock, then releases the lock and reads it back with bacmp() to decide between the CIS and BIS connect paths: lock_sock(sk); bacpy(&iso_pi(sk)->dst, &sa->iso_bdaddr); iso_pi(sk)->dst_type =3D sa->iso_bdaddr_type; release_sock(sk); if (bacmp(&iso_pi(sk)->dst, BDADDR_ANY)) // <- no lock held This read after release_sock() races with any concurrent write to iso_pi(sk)->dst on the same socket. Fix by performing the bacmp() inside the lock_sock critical section and caching the result in a local variable. This patch addresses only the bacmp() race in iso_sock_connect(); other unprotected iso_pi(sk) accesses are fixed separately in the next patch. KCSAN report: BUG: KCSAN: data-race in memcmp+0x39/0xb0 race at unknown origin, with read to 0xffff8f96ea66dde3 of 1 bytes by task = 549 on cpu 1: memcmp+0x39/0xb0 iso_sock_connect+0x275/0xb40 __sys_connect_file+0xbd/0xe0 __sys_connect+0xe0/0x110 __x64_sys_connect+0x40/0x50 x64_sys_call+0xcad/0x1c60 do_syscall_64+0x133/0x590 entry_SYSCALL_64_after_hwframe+0x77/0x7f value changed: 0x00 -> 0xee Reported by Kernel Concurrency Sanitizer on: CPU: 1 UID: 0 PID: 549 Comm: iso_race_combin Not tainted 7.0.0-08391-g1d51b= 370a0f8 #40 PREEMPT(lazy) Fixes: ccf74f2390d6 ("Bluetooth: Add BTPROTO_ISO socket type") Signed-off-by: SeungJu Cheon --- net/bluetooth/iso.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/net/bluetooth/iso.c b/net/bluetooth/iso.c index be145e2736b7..14963ba68597 100644 --- a/net/bluetooth/iso.c +++ b/net/bluetooth/iso.c @@ -1169,6 +1169,7 @@ static int iso_sock_connect(struct socket *sock, stru= ct sockaddr_unsized *addr, struct sockaddr_iso *sa =3D (struct sockaddr_iso *)addr; struct sock *sk =3D sock->sk; int err; + bool bcast; =20 BT_DBG("sk %p", sk); =20 @@ -1191,9 +1192,11 @@ static int iso_sock_connect(struct socket *sock, str= uct sockaddr_unsized *addr, bacpy(&iso_pi(sk)->dst, &sa->iso_bdaddr); iso_pi(sk)->dst_type =3D sa->iso_bdaddr_type; =20 + bcast =3D !bacmp(&iso_pi(sk)->dst, BDADDR_ANY); + release_sock(sk); =20 - if (bacmp(&iso_pi(sk)->dst, BDADDR_ANY)) + if (!bcast) err =3D iso_connect_cis(sk); else err =3D iso_connect_bis(sk); --=20 2.52.0 From nobody Tue Jun 16 10:11:11 2026 Received: from mail-pl1-f181.google.com (mail-pl1-f181.google.com [209.85.214.181]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D2D27339866 for ; Sat, 18 Apr 2026 05:34:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.181 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776490476; cv=none; b=i4vLy7uCZ0wR4hx68yv9CreTJdZJJqYZsQ2MatcR5o3FGn288eA/ztz+lfWdIJtGE4NsfHkJBIBLRHQBAwwRfxvtZVplpXw6/vjvgEnI+yzvZ995RlOu6swqSFMJlgRiossgfwY4RCWrivYos4jNGJOaOvaN2n2fy3zR97tTagU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776490476; c=relaxed/simple; bh=ZnOAyes5CApyxa4LVMptpnmk61/+ReVizQGGbcTr3UM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=BwgZ964BYqHQmQLudMHNba07XkMmUG7h0x++fcKSvvMW4au32+QhTd8DFEgCneQro8zWrG1fL0VLuITxsfKf2SrBgCyrxJ5Db7uZGkWjob9RILB2IJfHwe/HfImH6c5YoZtodd/yIGplnx5yOydgz3pScFAtlYb3iJmu7NusQ98= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=pqnlxoEZ; arc=none smtp.client-ip=209.85.214.181 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="pqnlxoEZ" Received: by mail-pl1-f181.google.com with SMTP id d9443c01a7336-2b24fcc2b5dso9168965ad.1 for ; Fri, 17 Apr 2026 22:34:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1776490474; x=1777095274; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=moJK8j1PeysA2HLtwd4ur3AEjzXIvTcplo5qR2WzdzM=; b=pqnlxoEZJaI93YOA9MgOipcyRmPCLLH3Y05Mh8Hxwe6XQN/6xHeo3ltDgxU9G24KKZ QXy47f2bfq9+k6gg4jqYakaUWjT1XZ9Hbs4IO+mTwTt4DCDkYB3pVRpgulG45kp5HgP6 tNPo0o3D5qSu8oZq5UJn6JlGpyfeAHzs0efB7uC9T2yz46KfvcRmoZ8w9CyAdshr92nb Ql8rw//OxcEhGwrfC2SMc6S18rfpBf0qP6siDND5cf17x2SyxdeI28VNidnwZagr1Xia SbDzd9qW0AtjL2fyY2svE62FSodhU9kRdoz8EcTIXwtIIsiP+UWoFSyxhNkkt+MofU6i TpRQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1776490474; x=1777095274; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=moJK8j1PeysA2HLtwd4ur3AEjzXIvTcplo5qR2WzdzM=; b=dKQehoXQlbl1DI8yTD/DYB9xPWSpZjG9khwTnuVCzRrl+5KHq3tnNv4An2a4p3lx4w 1xy4NVlMfMCcKPUtKp0xHIFNSn9IchVT6OVbWOfaWg+o4Bmy2sl8ctgC9pqWudW6zF6V /UZZmjm1Kslf1nRDCnbEhpfumTcQgTUeQyCIK8MV9kmRZsZrYc0lcyPp5n8ZCBPo91ka eP63Z4jhWYQR8qZ183ovGbwcy0QxbJCpljCHED7Hs4l0rHnnzS46WQ213Az0zl2bkD1Q s+eeU89fe0cNT6I6qGiqS7Dek0R4xCex9+mt+UGU9+fwcmPIX8J6BLxoFgPjchbU5tK8 9GIA== X-Forwarded-Encrypted: i=1; AFNElJ/AUsRO+WJmJFM3SfssPt+90gQxSpKw0LgKx68c7i+H3b+8drSuSjxt/SpEvM0xs9H/Bbc1CAzjf05N6t8=@vger.kernel.org X-Gm-Message-State: AOJu0Yz/K3334PjEYQ/LGvrddaoihYyRVEt/IvJeqXMSy5Eq5/HqN7+0 ffloAhn5rBphaHpvyJpYTvT8qpa2RDifq03L5jtCTs+1sMUr6hL/jTNA X-Gm-Gg: AeBDietW+UD1vgF/SDmb2vGuW5wv5fONG6s9O9i6/56veClDqA1KQw+2W6MQPAJxkCu f7WOAEIbFmS/CgwP9sdUaQNbglmtt3sDHwak9fOkX7HstZm6UZkMl+FOaVRGUZHwivLiY+9Mq2C Q6k7SujrYk4TqqAd3qXn/wCLFiqWAss/2IT3fEl5RWIUvh2HX3dJMHFrXJV8cMy/oWj/ybtlbeH B2Vy1SId1wMiRs0PwvSe36crsgve3aEAxdzC18LQ3n9yzxE++Dm1qy5Zy5Uz8eoFeqP1OLwbbuL n1LFAgBYpPyZ9++CVGB4A+J+WTUuaBFnvu6/xJLM3pVZCuv6P4S5USb7m45TQb0JkPAyZGF+nSG i/3hrfLpktHftFiCwNf/XHVg/HEMeDEGCBZ7+s9sDXLFkjWz6IkcvB9zt6PIVTduTgZH6YVIlxM v4KJXsxb71sZFCKEcKUn59gpwIB8hy7A4DoQFqWhvFQ7aDz9Tel/Vv+JInEg== X-Received: by 2002:a17:903:890:b0:2b0:5968:a6d5 with SMTP id d9443c01a7336-2b5f9ef3e8fmr41044065ad.18.1776490474181; Fri, 17 Apr 2026 22:34:34 -0700 (PDT) Received: from fedora ([61.74.238.173]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2b5fa9ff3bfsm46251885ad.7.2026.04.17.22.34.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Apr 2026 22:34:33 -0700 (PDT) From: SeungJu Cheon To: luiz.dentz@gmail.com, marcel@holtmann.org Cc: linux-bluetooth@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, me@brighamcampbell.com, skhan@linuxfoundation.org, linux-kernel-mentees@lists.linux.dev, SeungJu Cheon Subject: [PATCH 2/2] Bluetooth: ISO: Fix data-race on iso_pi(sk) in socket and HCI event paths Date: Sat, 18 Apr 2026 14:34:01 +0900 Message-ID: <20260418053401.128483-3-suunj1331@gmail.com> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260418053401.128483-1-suunj1331@gmail.com> References: <20260418053401.128483-1-suunj1331@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Several iso_pi(sk) fields (qos, qos_user_set, bc_sid, base, base_len, sync_handle, bc_num_bis) are written under lock_sock in iso_sock_setsockopt() and iso_sock_bind(), but read and written under hci_dev_lock only in two other paths: - iso_connect_bis() / iso_connect_cis(), invoked from connect(2), read qos/base/bc_sid and reset qos to default_qos on the qos_user_set validation failure -- all without lock_sock. - iso_connect_ind(), invoked from hci_rx_work, writes sync_handle, bc_sid, qos.bcast.encryption, bc_num_bis, base and base_len on PA_SYNC_ESTABLISHED / PAST_RECEIVED / BIG_INFO_ADV_REPORT / PER_ADV_REPORT events. The BIG_INFO handler additionally passes &iso_pi(sk)->qos together with sync_handle / bc_num_bis / bc_bis to hci_conn_big_create_sync() while setsockopt may be mutating them. Acquire lock_sock around the affected accesses in both paths. The locking order hci_dev_lock -> lock_sock matches the existing iso_conn_big_sync() precedent, whose comment documents the same requirement for hci_conn_big_create_sync(). The HCI connect/bind helpers do not wait for command completion -- they enqueue work via hci_cmd_sync_queue{,_once}() / hci_le_create_cis_pending() and return -- so the added hold time is comparable to iso_conn_big_sync(). KCSAN report: BUG: KCSAN: data-race in iso_connect_cis / iso_sock_setsockopt read to 0xffffa3ae8ce3cdc8 of 1 bytes by task 335 on cpu 0: iso_connect_cis+0x49f/0xa20 iso_sock_connect+0x60e/0xb40 __sys_connect_file+0xbd/0xe0 __sys_connect+0xe0/0x110 __x64_sys_connect+0x40/0x50 x64_sys_call+0xcad/0x1c60 do_syscall_64+0x133/0x590 entry_SYSCALL_64_after_hwframe+0x77/0x7f write to 0xffffa3ae8ce3cdc8 of 60 bytes by task 334 on cpu 1: iso_sock_setsockopt+0x69a/0x930 do_sock_setsockopt+0xc3/0x170 __sys_setsockopt+0xd1/0x130 __x64_sys_setsockopt+0x64/0x80 x64_sys_call+0x1547/0x1c60 do_syscall_64+0x133/0x590 entry_SYSCALL_64_after_hwframe+0x77/0x7f Reported by Kernel Concurrency Sanitizer on: CPU: 1 UID: 0 PID: 334 Comm: iso_setup_race Not tainted 7.0.0-10949-g8541d8= f725c6 #44 PREEMPT(lazy) The iso_connect_ind() races were found by inspection. Fixes: ccf74f2390d6 ("Bluetooth: Add BTPROTO_ISO socket type") Signed-off-by: SeungJu Cheon --- net/bluetooth/iso.c | 54 +++++++++++++++++++++++++-------------------- 1 file changed, 30 insertions(+), 24 deletions(-) diff --git a/net/bluetooth/iso.c b/net/bluetooth/iso.c index 14963ba68597..3ba13769be3a 100644 --- a/net/bluetooth/iso.c +++ b/net/bluetooth/iso.c @@ -347,6 +347,7 @@ static int iso_connect_bis(struct sock *sk) return -EHOSTUNREACH; =20 hci_dev_lock(hdev); + lock_sock(sk); =20 if (!bis_capable(hdev)) { err =3D -EOPNOTSUPP; @@ -399,13 +400,9 @@ static int iso_connect_bis(struct sock *sk) goto unlock; } =20 - lock_sock(sk); - err =3D iso_chan_add(conn, sk, NULL); - if (err) { - release_sock(sk); + if (err) goto unlock; - } =20 /* Update source addr of the socket */ bacpy(&iso_pi(sk)->src, &hcon->src); @@ -421,9 +418,8 @@ static int iso_connect_bis(struct sock *sk) iso_sock_set_timer(sk, READ_ONCE(sk->sk_sndtimeo)); } =20 - release_sock(sk); - unlock: + release_sock(sk); hci_dev_unlock(hdev); hci_dev_put(hdev); return err; @@ -444,6 +440,7 @@ static int iso_connect_cis(struct sock *sk) return -EHOSTUNREACH; =20 hci_dev_lock(hdev); + lock_sock(sk); =20 if (!cis_central_capable(hdev)) { err =3D -EOPNOTSUPP; @@ -498,13 +495,9 @@ static int iso_connect_cis(struct sock *sk) goto unlock; } =20 - lock_sock(sk); - err =3D iso_chan_add(conn, sk, NULL); - if (err) { - release_sock(sk); + if (err) goto unlock; - } =20 /* Update source addr of the socket */ bacpy(&iso_pi(sk)->src, &hcon->src); @@ -520,9 +513,8 @@ static int iso_connect_cis(struct sock *sk) iso_sock_set_timer(sk, READ_ONCE(sk->sk_sndtimeo)); } =20 - release_sock(sk); - unlock: + release_sock(sk); hci_dev_unlock(hdev); hci_dev_put(hdev); return err; @@ -2259,8 +2251,10 @@ int iso_connect_ind(struct hci_dev *hdev, bdaddr_t *= bdaddr, __u8 *flags) sk =3D iso_get_sock(hdev, &hdev->bdaddr, bdaddr, BT_LISTEN, iso_match_sid, ev1); if (sk && !ev1->status) { + lock_sock(sk); iso_pi(sk)->sync_handle =3D le16_to_cpu(ev1->handle); iso_pi(sk)->bc_sid =3D ev1->sid; + release_sock(sk); } =20 goto done; @@ -2271,8 +2265,10 @@ int iso_connect_ind(struct hci_dev *hdev, bdaddr_t *= bdaddr, __u8 *flags) sk =3D iso_get_sock(hdev, &hdev->bdaddr, bdaddr, BT_LISTEN, iso_match_sid_past, ev1a); if (sk && !ev1a->status) { + lock_sock(sk); iso_pi(sk)->sync_handle =3D le16_to_cpu(ev1a->sync_handle); iso_pi(sk)->bc_sid =3D ev1a->sid; + release_sock(sk); } =20 goto done; @@ -2299,27 +2295,35 @@ int iso_connect_ind(struct hci_dev *hdev, bdaddr_t = *bdaddr, __u8 *flags) ev2); =20 if (sk) { - int err; - struct hci_conn *hcon =3D iso_pi(sk)->conn->hcon; + int err =3D 0; + bool big_sync; + struct hci_conn *hcon; =20 + lock_sock(sk); + + hcon =3D iso_pi(sk)->conn->hcon; iso_pi(sk)->qos.bcast.encryption =3D ev2->encryption; =20 if (ev2->num_bis < iso_pi(sk)->bc_num_bis) iso_pi(sk)->bc_num_bis =3D ev2->num_bis; =20 - if (!test_bit(BT_SK_DEFER_SETUP, &bt_sk(sk)->flags) && - !test_and_set_bit(BT_SK_BIG_SYNC, &iso_pi(sk)->flags)) { + big_sync =3D !test_bit(BT_SK_DEFER_SETUP, &bt_sk(sk)->flags) && + !test_and_set_bit(BT_SK_BIG_SYNC, &iso_pi(sk)->flags); + + if (big_sync) err =3D hci_conn_big_create_sync(hdev, hcon, &iso_pi(sk)->qos, iso_pi(sk)->sync_handle, iso_pi(sk)->bc_num_bis, iso_pi(sk)->bc_bis); - if (err) { - bt_dev_err(hdev, "hci_le_big_create_sync: %d", - err); - sock_put(sk); - sk =3D NULL; - } + + release_sock(sk); + + if (big_sync && err) { + bt_dev_err(hdev, "hci_le_big_create_sync: %d", + err); + sock_put(sk); + sk =3D NULL; } } =20 @@ -2373,8 +2377,10 @@ int iso_connect_ind(struct hci_dev *hdev, bdaddr_t *= bdaddr, __u8 *flags) if (!base || base_len > BASE_MAX_LENGTH) goto done; =20 + lock_sock(sk); memcpy(iso_pi(sk)->base, base, base_len); iso_pi(sk)->base_len =3D base_len; + release_sock(sk); } else { /* This is a PA data fragment. Keep pa_data_len set to 0 * until all data has been reassembled. --=20 2.52.0