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 A3B2B2E92BC; Tue, 17 Jun 2025 16:02:43 +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=1750176163; cv=none; b=amxDLwnHAU7r8CCwjPkcOqj+akE2mDwXGr2DB6ek0e7drZj3+g8/J+HdH0L3QHnpRMR3dILiYFGQXxYrm5ewJ/oo+j4Bx7Z8SAax79BfGHg4a0KGJu0XoPMzgmM0fPDc5ZscfxDIdypJ6usbzT+Bnj61unOCkiynuzSBgmb64zU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750176163; c=relaxed/simple; bh=e92jFH7tL8P0OmoG1tc/oJWtg37Bmc4Ir03TzHb6aSk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=L1XCWKpFT58PG3c5GpLWcMTvbexztb+paqLJgbGXoRPgDvBZ2X91S845w4jo0v81wI0njY41i5jbH3iFqbmCXG0OHnifGuBCFty84JFuQWSnK6aJUTSiJrsLN3BzfkoUQ3HUfy8qwD9/go3XDDOkv/RKCyoA0GAeRue4CDoM2uE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=1TFGENak; 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="1TFGENak" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 120C8C4CEE3; Tue, 17 Jun 2025 16:02:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1750176163; bh=e92jFH7tL8P0OmoG1tc/oJWtg37Bmc4Ir03TzHb6aSk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=1TFGENakN2oEVGALZ6o7yJCsGxgVBJqo9novLj1NnDh2WbotBOdPnXligbBPxxuJG hSb2B7prOr/C2KNYGoCKBmwSQS20c6vFXNQrVGEyT4TKB+FuNEAh1jq5sT4nqAuNzd t3EBEMQIKXNrpWRyjFJ1hwV3YP9Av/G0aUheFLx8= 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.6 251/356] Bluetooth: L2CAP: Fix not responding with L2CAP_CR_LE_ENCRYPTION Date: Tue, 17 Jun 2025 17:26:06 +0200 Message-ID: <20250617152348.305994648@linuxfoundation.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250617152338.212798615@linuxfoundation.org> References: <20250617152338.212798615@linuxfoundation.org> User-Agent: quilt/0.68 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.6-stable review patch. If anyone has any objections, please let me know. ------------------ From: Luiz Augusto von Dentz [ Upstream commit 03dba9cea72f977e873e4e60e220fa596959dd8f ] Depending on the security set the response to L2CAP_LE_CONN_REQ shall be just L2CAP_CR_LE_ENCRYPTION if only encryption when BT_SECURITY_MEDIUM is selected since that means security mode 2 which doesn't require authentication which is something that is covered in the qualification test L2CAP/LE/CFC/BV-25-C. Link: https://github.com/bluez/bluez/issues/1270 Fixes: 27e2d4c8d28b ("Bluetooth: Add basic LE L2CAP connect request receiving support") Signed-off-by: Luiz Augusto von Dentz Signed-off-by: Sasha Levin --- net/bluetooth/l2cap_core.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c index 1c54e812ef1f7..2744ad11687c6 100644 --- a/net/bluetooth/l2cap_core.c +++ b/net/bluetooth/l2cap_core.c @@ -4833,7 +4833,8 @@ static int l2cap_le_connect_req(struct l2cap_conn *conn, if (!smp_sufficient_security(conn->hcon, pchan->sec_level, SMP_ALLOW_STK)) { - result = L2CAP_CR_LE_AUTHENTICATION; + result = pchan->sec_level == BT_SECURITY_MEDIUM ? + L2CAP_CR_LE_ENCRYPTION : L2CAP_CR_LE_AUTHENTICATION; chan = NULL; goto response_unlock; } -- 2.39.5