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 45FF910A35; Mon, 4 Mar 2024 21:27:10 +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=1709587631; cv=none; b=iKxwFSJWl8xMap7JN5/TjKF1opnmZS9sNFjBMePuyAIL+tMxpJbqelGR5XDZAuEA22IbiJj3CzF8Wcg7DEKqISFrbGmiHNmKX5Mt3ofHY1NzbkC+kn+uI5l5ESSZWf89efer64jXDqITaZo69QC2EY17+MGg9j/4Zx+Z8J/KozQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709587631; c=relaxed/simple; bh=RYGq+/P5kb8a3+EdErzsK5OoHnw8jH+H249wXl/NTC0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=lpYq5WIduU6gJZAXCdBhS7DDgnehrJFDamBbUW1G93RSfvVf+h6edJu5oYrZF86TuB/KTUVO7hj8m5AVXnIyqPdw8Hp1edBoBkyX+Jav0UVBgDlNddPWU5X5H1/RuBjAPPSlQKJCabsSOszM/4Pes2Qrlard+oqVwHdB5jU9oM0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=dfXo+ZCk; 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="dfXo+ZCk" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 71AD9C433F1; Mon, 4 Mar 2024 21:27:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1709587630; bh=RYGq+/P5kb8a3+EdErzsK5OoHnw8jH+H249wXl/NTC0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=dfXo+ZCkNiYOgaj22yIif6qKufPCh80g6g0IX6aJFjMMX4024H0meaaD/IJ1oUoQO xKpvRWow2zpD6EyvkMPf9aHZtY5qUFHdFFNlgcycwnc82nbdnDpmEzxbnWvlZACWvp FYv8tFVC0vLcwvPAXJnxG8YZhZ/ysEg634RS9Dug= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Luiz Augusto von Dentz , Sasha Levin Subject: [PATCH 6.7 029/162] Bluetooth: hci_event: Fix handling of HCI_EV_IO_CAPA_REQUEST Date: Mon, 4 Mar 2024 21:21:34 +0000 Message-ID: <20240304211552.767088918@linuxfoundation.org> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240304211551.833500257@linuxfoundation.org> References: <20240304211551.833500257@linuxfoundation.org> User-Agent: quilt/0.67 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.7-stable review patch. If anyone has any objections, please let me know. ------------------ From: Luiz Augusto von Dentz [ Upstream commit 7e74aa53a68bf60f6019bd5d9a9a1406ec4d4865 ] If we received HCI_EV_IO_CAPA_REQUEST while HCI_OP_READ_REMOTE_EXT_FEATURES is yet to be responded assume the remote does support SSP since otherwise this event shouldn't be generated. Link: https://lore.kernel.org/linux-bluetooth/CABBYNZ+9UdG1cMZVmdtN3U2aS16AKMCyTARZZyFX7xTEDWcMOw@mail.gmail.com/T/#t Fixes: c7f59461f5a7 ("Bluetooth: Fix a refcnt underflow problem for hci_conn") Signed-off-by: Luiz Augusto von Dentz Signed-off-by: Sasha Levin --- net/bluetooth/hci_event.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c index 22b22c264c2a5..613f2fd0bcc1e 100644 --- a/net/bluetooth/hci_event.c +++ b/net/bluetooth/hci_event.c @@ -5329,9 +5329,12 @@ static void hci_io_capa_request_evt(struct hci_dev *hdev, void *data, hci_dev_lock(hdev); conn = hci_conn_hash_lookup_ba(hdev, ACL_LINK, &ev->bdaddr); - if (!conn || !hci_conn_ssp_enabled(conn)) + if (!conn || !hci_dev_test_flag(hdev, HCI_SSP_ENABLED)) goto unlock; + /* Assume remote supports SSP since it has triggered this event */ + set_bit(HCI_CONN_SSP_ENABLED, &conn->flags); + hci_conn_hold(conn); if (!hci_dev_test_flag(hdev, HCI_MGMT)) -- 2.43.0