From mboxrd@z Thu Jan 1 00:00:00 1970 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 3FE173B38A3; Mon, 23 Mar 2026 14:08:04 +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=1774274884; cv=none; b=Lt3PGSiC3RtQNYGOuLue6lccx9rugU4j4+XdqIcpoFR1UtXa5tdbLJPrJjzvnSLoeKpFX4DVX03umnIDhhvaZJidaI3pNiL3stN8jLEq6cjSjkCz4y8u6AmOZaQf2yYpvYzEeDLNszi6xuqIqBxL+uPSX6s40k+4FACDh6mVDsM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774274884; c=relaxed/simple; bh=1qjj7iOjuzjDqfI+HhCibzCPZOnSS37BPA4qHHfEK8o=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=tjpVQHWveA6nD+tLdZCpe/CzNcrhZ2D3WGWFzvGM1zriRfn//76I+vLQ1vyKVG0qNQ2fbUmNjBAiVPrUD6FIkQkeU7EjV75D59LcmzNsTZtuhGs8zfhbdkc05m38ltJXtj2ZpF/X7VzJqEDTRT+i1n04+ahRP89Nd0D8CEeVbqk= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=V4EsTc2t; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="V4EsTc2t" Received: by smtp.kernel.org (Postfix) with ESMTPSA id C816EC4CEF7; Mon, 23 Mar 2026 14:08:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1774274884; bh=1qjj7iOjuzjDqfI+HhCibzCPZOnSS37BPA4qHHfEK8o=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=V4EsTc2tjGDRgkDL8q14V/2bLkpIG1Fj9stI/AilzpTsV/SicwsBDyTjlQ7WauZiq PXyhgQvS/TOEIfzKJVLhOetfqzHCzjeLzfu/Y7FLla8xK3zEyOlBPkXhj+Gjg6Swaj XsTPYJuIaB/7k7tk4ur6hhjU4IuwQyjpIZoaaZ7U= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Michael Grzeschik , Luiz Augusto von Dentz , Sasha Levin Subject: [PATCH 6.18 126/212] Bluetooth: hci_sync: Fix hci_le_create_conn_sync Date: Mon, 23 Mar 2026 14:45:47 +0100 Message-ID: <20260323134507.751631244@linuxfoundation.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260323134503.770111826@linuxfoundation.org> References: <20260323134503.770111826@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Michael Grzeschik [ Upstream commit 2cabe7ff1001b7a197009cf50ba71701f9cbd354 ] While introducing hci_le_create_conn_sync the functionality of hci_connect_le was ported to hci_le_create_conn_sync including the disable of the scan before starting the connection. When this code was run non synchronously the immediate call that was setting the flag HCI_LE_SCAN_INTERRUPTED had an impact. Since the completion handler for the LE_SCAN_DISABLE was not immediately called. In the completion handler of the LE_SCAN_DISABLE event, this flag is checked to set the state of the hdev to DISCOVERY_STOPPED. With the synchronised approach the later setting of the HCI_LE_SCAN_INTERRUPTED flag has not the same effect. The completion handler would immediately fire in the LE_SCAN_DISABLE call, check for the flag, which is then not yet set and do nothing. To fix this issue and make the function call work as before, we move the setting of the flag HCI_LE_SCAN_INTERRUPTED before disabling the scan. Fixes: 8e8b92ee60de ("Bluetooth: hci_sync: Add hci_le_create_conn_sync") Signed-off-by: Michael Grzeschik Signed-off-by: Luiz Augusto von Dentz Signed-off-by: Sasha Levin --- net/bluetooth/hci_sync.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/bluetooth/hci_sync.c b/net/bluetooth/hci_sync.c index 9f01837250a5e..e94b62844e1ef 100644 --- a/net/bluetooth/hci_sync.c +++ b/net/bluetooth/hci_sync.c @@ -6578,8 +6578,8 @@ static int hci_le_create_conn_sync(struct hci_dev *hdev, void *data) * state. */ if (hci_dev_test_flag(hdev, HCI_LE_SCAN)) { - hci_scan_disable_sync(hdev); hci_dev_set_flag(hdev, HCI_LE_SCAN_INTERRUPTED); + hci_scan_disable_sync(hdev); } /* Update random address, but set require_privacy to false so -- 2.51.0