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 25F8F3AD537; Mon, 23 Mar 2026 14:09:28 +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=1774274969; cv=none; b=q+iOfXrRTfCll4UHRdd6Sb+4fABVacrK0/KHavjPQBsh2wCmSEur8xqWHmLRYrIVVU2gm4i0RFVucBAwGmwzOsgxAgdWjLV67KZbUrFGbudMc/uaQa7gEVN+yHiwj67RlQNPGLGza5VVPj93aOBhP+T4fgmnIDcvpz5tPxXsX2E= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774274969; c=relaxed/simple; bh=dWe2ZvDg/T3C7C6axrgRkRJrT3vmFToQGzPF+kji2fU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=BfULpAkJ6LuWis2Nr4tIYd5vfHyZIbV+Qo2tcgRpwE7zUTL4m9CUd+zEA1FdZP10JbYAOA6IS2+SkG4LetYhAQK5parMN8mcPxwa/nDmXvaUj4twvUg6YVjWuNPvneRHTYjKRy16LeR2fMEo6K4341agqTWKwegB/pXHjhgcsjw= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=DNXVcVgx; 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="DNXVcVgx" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 67DE0C2BC9E; Mon, 23 Mar 2026 14:09:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1774274968; bh=dWe2ZvDg/T3C7C6axrgRkRJrT3vmFToQGzPF+kji2fU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=DNXVcVgxRhIStz3bClzq/9DGEQWc2isZ8gTiQ6QGZvZkyJLTuRN8fA82cCa716XoK d/lTPCgmHrKMBSm+xEj7Jj5biuQYzRNQvzelAsNp4At5bZX/lDpZTkYSD9pP5dXsSU KuoMv1Tku89Tx2o8Iqz4ccoYTt+kZkXNJ2qKenuE= 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.18 124/212] Bluetooth: SMP: make SM/PER/KDU/BI-04-C happy Date: Mon, 23 Mar 2026 14:45:45 +0100 Message-ID: <20260323134507.685832162@linuxfoundation.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260323134503.770111826@linuxfoundation.org> References: <20260323134503.770111826@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 6.18-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 3a1ce04a7a536..9d96040745897 100644 --- a/net/bluetooth/smp.c +++ b/net/bluetooth/smp.c @@ -2743,7 +2743,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