From nobody Sun Oct 5 07:20:28 2025 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 96EE923C512; Thu, 7 Aug 2025 07:56:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1754553367; cv=none; b=FLI1jjjfIEMpeHE8aFXddno4gFVns/k3pWnhWuUWb4pPoab9+LpTTCd62dZLzYwwvCYB/p1RrCwHIG+M606ioniNpKhLeEyj60DiNkY/OuQGrAmBtJnm87DViZjW5HsfHhoyLsRlM/xiQyEU6Frq4SUExTg+50TcFgANhSfbTsw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1754553367; c=relaxed/simple; bh=AzHBwyfNbGjc4Jw1PZGXaDtEdx1kamPVd4BLcSJLvBo=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:To:Cc; b=MlDfd+zEe96KuVLbOG8zxV2G7wOz9UeyO3kfhRPr1eq5CAbP+taNmUV2awN2wrNZJJx/n9k3wEUYWbiVnalnyF+r7DTqRQzGouVqIf6r1vBvKH7VZt1DXgYsB/UhpoVQuIfg58U+C24yBENUl6msCm82i9z/sLtRR7uWptuTkxM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=qGZp1GuR; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="qGZp1GuR" Received: by smtp.kernel.org (Postfix) with ESMTPS id 35588C4CEEB; Thu, 7 Aug 2025 07:56:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1754553367; bh=AzHBwyfNbGjc4Jw1PZGXaDtEdx1kamPVd4BLcSJLvBo=; h=From:Date:Subject:To:Cc:Reply-To:From; b=qGZp1GuRICWLHmriBZXuC1xu7cOLoxviiWBHO1AB0FutndTWkZq8IpP7BIayvcf3X InyQzcsN9gcv8pdQ0kpTae7kUhKBssk4auHquZ4Xdv7k04pPRaBIG5ixY3v5fAEs0H x+lM3EcCU6e2Uym+QZMfx3fTM4d2ZIQmLPiWO1VA7EqH/uw7MZcgvVZ93fO65vbRfL VRLCunIVFj10BBE/cj2mPdsWjDPe1pFUX/EQyeT0XNQQTBXzWYGp8rL+kkUJ2ir+gS /UyUd9umnXXk4jZ6G/Xbh/lFlqyG6/apwI0M8fa1RPWZIVu4PtgKZCfNFzZOPOHaL2 tyiTfVx2VdyCQ== Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 25E2CC87FCA; Thu, 7 Aug 2025 07:56:07 +0000 (UTC) From: Yang Li via B4 Relay Date: Thu, 07 Aug 2025 15:56:03 +0800 Subject: [PATCH] Bluetooth: hci_sync: Prevent unintended PA sync when SID is 0xFF Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250807-sid_invalid-v1-1-94b3902a49e3@amlogic.com> X-B4-Tracking: v=1; b=H4sIABJclGgC/x3MQQqAIBBA0avIrBNsIJOuEhGmYw2EhYIE4d2Tl m/x/wuZElOGSbyQqHDmKzb0nQB32LiTZN8MqHBQRo0ys185Fnuyl+jMplHbgBSgFXeiwM9/m5d aP661q7FdAAAA To: Marcel Holtmann , Johan Hedberg , Luiz Augusto von Dentz Cc: linux-bluetooth@vger.kernel.org, linux-kernel@vger.kernel.org, Yang Li X-Mailer: b4 0.13-dev-f0463 X-Developer-Signature: v=1; a=ed25519-sha256; t=1754553364; l=2518; i=yang.li@amlogic.com; s=20240418; h=from:subject:message-id; bh=CtzsG6OQjFbI3wHcVoNvKNs7wHlNBWzJw+zuy9bA75s=; b=ETEyq1rB1JGnX2oJgwsj6kgqPnLa65UEjLLIkyn2hV7modUsnow39Wh8EqiU4f2YaEViwC/HV 6qM4SraBE3vARqgqVRrjGO9n13Ti6NdV6+nXLRN8wRtvZwpCW/Zm6Wk X-Developer-Key: i=yang.li@amlogic.com; a=ed25519; pk=86OaNWMr3XECW9HGNhkJ4HdR2eYA5SEAegQ3td2UCCs= X-Endpoint-Received: by B4 Relay for yang.li@amlogic.com/20240418 with auth_id=180 X-Original-From: Yang Li Reply-To: yang.li@amlogic.com From: Yang Li After LE Extended Scan times out, conn->sid remains 0xFF, so the PA sync creation process should be aborted. Btmon snippet from PA sync with SID=3D0xFF: < HCI Command: LE Set Extended.. (0x08|0x0042) plen 6 #74726 [hci0] 863.10= 7927 Extended scan: Enabled (0x01) Filter duplicates: Enabled (0x01) Duration: 0 msec (0x0000) Period: 0.00 sec (0x0000) > HCI Event: Command Complete (0x0e) plen 4 #74727 [hci0] 863.10= 9389 LE Set Extended Scan Enable (0x08|0x0042) ncmd 1 Status: Success (0x00) < HCI Command: LE Periodic Ad.. (0x08|0x0044) plen 14 #74728 [hci0] 865.14= 1168 Options: 0x0000 Use advertising SID, Advertiser Address Type and address Reporting initially enabled SID: 0xff Adv address type: Random (0x01) Adv address: 0D:D7:2C:E7:42:46 (Non-Resolvable) Skip: 0x0000 Sync timeout: 20000 msec (0x07d0) Sync CTE type: 0x0000 > HCI Event: Command Status (0x0f) plen 4 #74729 [hci0] 865.14= 3223 LE Periodic Advertising Create Sync (0x08|0x0044) ncmd 1 Status: Success (0x00) Signed-off-by: Yang Li --- net/bluetooth/hci_sync.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/net/bluetooth/hci_sync.c b/net/bluetooth/hci_sync.c index 387c128f2ba0..540794a4495f 100644 --- a/net/bluetooth/hci_sync.c +++ b/net/bluetooth/hci_sync.c @@ -7045,10 +7045,13 @@ static int hci_le_pa_create_sync(struct hci_dev *hd= ev, void *data) /* SID has not been set listen for HCI_EV_LE_EXT_ADV_REPORT to update * it. */ - if (conn->sid =3D=3D HCI_SID_INVALID) - __hci_cmd_sync_status_sk(hdev, HCI_OP_NOP, 0, NULL, + if (conn->sid =3D=3D HCI_SID_INVALID) { + err =3D __hci_cmd_sync_status_sk(hdev, HCI_OP_NOP, 0, NULL, HCI_EV_LE_EXT_ADV_REPORT, conn->conn_timeout, NULL); + if (err =3D=3D -ETIMEDOUT) + goto done; + } =20 memset(&cp, 0, sizeof(cp)); cp.options =3D qos->bcast.options; @@ -7078,6 +7081,7 @@ static int hci_le_pa_create_sync(struct hci_dev *hdev= , void *data) __hci_cmd_sync_status(hdev, HCI_OP_LE_PA_CREATE_SYNC_CANCEL, 0, NULL, HCI_CMD_TIMEOUT); =20 +done: hci_dev_clear_flag(hdev, HCI_PA_SYNC); =20 /* Update passive scan since HCI_PA_SYNC flag has been cleared */ --- base-commit: df18778595f9423542f38784749feca5471f9de7 change-id: 20250807-sid_invalid-2c8b626af2ef Best regards, --=20 Yang Li