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 A3F7C70838; Mon, 23 Jun 2025 21:07:36 +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=1750712856; cv=none; b=Pwy6B4rJxdEbbBiZ9L3emER5pNMrWiTESQ26NTKLzuaBPkK9CznRT2fq5zcTSljKi68h3RoLtTbXdrC1sqBjLE6Z6JJGIqu0p61TPLrvft5ezEV35JZuLZAlDoEjCsebHWV+EwedTNDFZS61fTOsE5ikJNVeLIXFRaI/tfiP0nU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750712856; c=relaxed/simple; bh=bRIo/ISUytMp/6GPtCwB8XbEsy2jEl+S+Lgl8941z+U=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ceXIMZzkSDlK24fdtXh63pgvn1wfPsWGfWv46XKGNPYn1FJM2YCbxtxn5bbAybWchpi9yMs1wOnrQTRKbQTuRVxA1Oq84XGZCXJr/OYsv4eCPDjYeHGew0+bxZrtrE8U0fZWD9I8/zTjbpl/uhM6BzJZnNtgoq4uHVyizFcMwl8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=VIfb+JRP; 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="VIfb+JRP" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3C513C4CEEA; Mon, 23 Jun 2025 21:07:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1750712856; bh=bRIo/ISUytMp/6GPtCwB8XbEsy2jEl+S+Lgl8941z+U=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=VIfb+JRPGFxPQzZ0Ce6l3cgi56p24dcBakrc+P6N6H69TsY6CwcWsFtfStd0fEiI5 80yYwYTtaOabu3kGAvuS/YUGOYyABFMQX4RlFt8T0AR/UBII12nVdyXL0rRwIundxm GmxBX/aWGH98TmayrSYApH2IbRNzJJu/jFqQ1Tdw= 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 5.10 102/355] Bluetooth: L2CAP: Fix not responding with L2CAP_CR_LE_ENCRYPTION Date: Mon, 23 Jun 2025 15:05:03 +0200 Message-ID: <20250623130629.849426323@linuxfoundation.org> X-Mailer: git-send-email 2.50.0 In-Reply-To: <20250623130626.716971725@linuxfoundation.org> References: <20250623130626.716971725@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.10-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 be281a95a0a8b..08d91a3d3460d 100644 --- a/net/bluetooth/l2cap_core.c +++ b/net/bluetooth/l2cap_core.c @@ -5861,7 +5861,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