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 414C62D8DDF; Mon, 4 May 2026 14:04:48 +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=1777903488; cv=none; b=UaI9ja1gA/qN41ISCpFG3l8n5cV8bLE3Pb6HEshvctWpIpa5rDXuoDBuVXyKw5Bh2xwcPB2yq0tozFOrmZRDhvNbo08Ig601j2AeAiTXRxR6DmL7BvdtUzcvzhCwxxVdD/1aCLM2UzBWgpOBVkH7qRhr+etKOV7LD79xY7anoyQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777903488; c=relaxed/simple; bh=iSU1Mw2gK6VmT9InAPKFycPIJShpI9yiy/SONKJV0k4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=VfwplydqXYSYW7uo9nmZfk1JqSoNTo1VM4VaP7LNYde/C3m2e2hDrBhXWQYlirXp67p4GgfXqOIjX6WJXNWZPs/jIBObuNGZowKJh9woUN3v9YkS6zvFRlagpcNkl/yDJwVrWWlxGk+NhiK/LTZjVp5wIXWlY6xIw/NinaHSdbQ= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=V2OxXfBM; 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="V2OxXfBM" Received: by smtp.kernel.org (Postfix) with ESMTPSA id CB326C2BCB8; Mon, 4 May 2026 14:04:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1777903488; bh=iSU1Mw2gK6VmT9InAPKFycPIJShpI9yiy/SONKJV0k4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=V2OxXfBMgnV6FkY28OZ2xFl2mPg+RgeI7GRQJ2QFN1ijmeqXUPJSrNd7Omy7OYORE eh732xJQzzivLqT54o5H5b7X8KMOaDNzjq+vWm6/1gVIVrkAIIAtTT7KRCO3Ke/kJK qk4tuNj509oXjG352tTMQMWtyeSkYwmHRlpu/610= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Shuvam Pandey , Luiz Augusto von Dentz Subject: [PATCH 7.0 254/307] Bluetooth: hci_event: fix potential UAF in SSP passkey handlers Date: Mon, 4 May 2026 15:52:19 +0200 Message-ID: <20260504135152.377253656@linuxfoundation.org> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260504135142.814938198@linuxfoundation.org> References: <20260504135142.814938198@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 7.0-stable review patch. If anyone has any objections, please let me know. ------------------ From: Shuvam Pandey commit 85fa3512048793076eef658f66489112dcc91993 upstream. hci_conn lookup and field access must be covered by hdev lock in hci_user_passkey_notify_evt() and hci_keypress_notify_evt(), otherwise the connection can be freed concurrently. Extend the hci_dev_lock critical section to cover all conn usage in both handlers. Keep the existing keypress notification behavior unchanged by routing the early exits through a common unlock path. Fixes: 92a25256f142 ("Bluetooth: mgmt: Implement support for passkey notification") Cc: stable@vger.kernel.org Signed-off-by: Shuvam Pandey Signed-off-by: Luiz Augusto von Dentz Signed-off-by: Greg Kroah-Hartman --- net/bluetooth/hci_event.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) --- a/net/bluetooth/hci_event.c +++ b/net/bluetooth/hci_event.c @@ -5498,9 +5498,11 @@ static void hci_user_passkey_notify_evt( bt_dev_dbg(hdev, ""); + hci_dev_lock(hdev); + conn = hci_conn_hash_lookup_ba(hdev, ACL_LINK, &ev->bdaddr); if (!conn) - return; + goto unlock; conn->passkey_notify = __le32_to_cpu(ev->passkey); conn->passkey_entered = 0; @@ -5509,6 +5511,9 @@ static void hci_user_passkey_notify_evt( mgmt_user_passkey_notify(hdev, &conn->dst, conn->type, conn->dst_type, conn->passkey_notify, conn->passkey_entered); + +unlock: + hci_dev_unlock(hdev); } static void hci_keypress_notify_evt(struct hci_dev *hdev, void *data, @@ -5519,14 +5524,16 @@ static void hci_keypress_notify_evt(stru bt_dev_dbg(hdev, ""); + hci_dev_lock(hdev); + conn = hci_conn_hash_lookup_ba(hdev, ACL_LINK, &ev->bdaddr); if (!conn) - return; + goto unlock; switch (ev->type) { case HCI_KEYPRESS_STARTED: conn->passkey_entered = 0; - return; + goto unlock; case HCI_KEYPRESS_ENTERED: conn->passkey_entered++; @@ -5541,13 +5548,16 @@ static void hci_keypress_notify_evt(stru break; case HCI_KEYPRESS_COMPLETED: - return; + goto unlock; } if (hci_dev_test_flag(hdev, HCI_MGMT)) mgmt_user_passkey_notify(hdev, &conn->dst, conn->type, conn->dst_type, conn->passkey_notify, conn->passkey_entered); + +unlock: + hci_dev_unlock(hdev); } static void hci_simple_pair_complete_evt(struct hci_dev *hdev, void *data,