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 A68C528504F; Mon, 23 Mar 2026 16:25:15 +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=1774283115; cv=none; b=EjXLgVnJ0FKcpMWzjSeVZ1vSQLD2DFP9i0jUXxkrbYG4hqv7qup1AQ2FR10WSjdDnZHfuThZxK7B/vJK4jH/OZrwdZyBpiRYH1xPLWvlvFgTVggPVbSrTY//iLTn/Np1NIylfVkmI23aEjHsf6Eq16ZHUNrsGqUVuSah/Uj8q5Q= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774283115; c=relaxed/simple; bh=daFFX8AD+KEtV73hTyaS2ng0qBrVhf0yszeDzp8H5eI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=jedcwA+A7AUpldXmG7dzAjBxMV1QQQisgOZk1ONupW9itl5i3q9UZmATgJJ48sk5smVvgt52Z1funv5pqmhU1RLpLNGU/h3cgZjCCGw/RF5T61vKB9RN+gIlEGFlyE1suydMsb2Nduz+3oWlItrMrwiEu4V93IpBJXDfaEYG0aQ= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=Ib1ugU2r; 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="Ib1ugU2r" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 00647C4CEF7; Mon, 23 Mar 2026 16:25:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1774283115; bh=daFFX8AD+KEtV73hTyaS2ng0qBrVhf0yszeDzp8H5eI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Ib1ugU2rXcJmMt/SYb466rdKTwVmnMD+6rVSOVn9DX97UssugwppYvOkPbaSAnJq1 4mrinu4pYN4mU2ATsLz5ONEgHpLUMOqyzoF9ZhKHMKzHElXeOWFRR4sywopybr2lqO ipdxhbFI010IMLo0btvpUmvJ/O1Wf1LJsfm+4inM= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Christian Eggers , Luiz Augusto von Dentz , Sasha Levin Subject: [PATCH 6.1 406/481] Bluetooth: SMP: make SM/PER/KDU/BI-04-C happy Date: Mon, 23 Mar 2026 14:46:28 +0100 Message-ID: <20260323134535.075677322@linuxfoundation.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260323134525.256603107@linuxfoundation.org> References: <20260323134525.256603107@linuxfoundation.org> User-Agent: quilt/0.69 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 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Christian Eggers [ Upstream commit 0e4d4dcc1a6e82cc6f9abf32193558efa7e1613d ] The last test step ("Test with Invalid public key X and Y, all set to 0") expects to get an "DHKEY check failed" instead of "unspecified". Fixes: 6d19628f539f ("Bluetooth: SMP: Fail if remote and local public keys are identical") Signed-off-by: Christian Eggers Signed-off-by: Luiz Augusto von Dentz Signed-off-by: Sasha Levin --- net/bluetooth/smp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/bluetooth/smp.c b/net/bluetooth/smp.c index d8a77bfe65a62..4241d39393f3e 100644 --- a/net/bluetooth/smp.c +++ b/net/bluetooth/smp.c @@ -2737,7 +2737,7 @@ static int smp_cmd_public_key(struct l2cap_conn *conn, struct sk_buff *skb) if (!test_bit(SMP_FLAG_DEBUG_KEY, &smp->flags) && !crypto_memneq(key, smp->local_pk, 64)) { bt_dev_err(hdev, "Remote and local public keys are identical"); - return SMP_UNSPECIFIED; + return SMP_DHKEY_CHECK_FAILED; } memcpy(smp->remote_pk, key, 64); -- 2.51.0