Bluetooth: SMP: make SM/PER/KDU/BI-04-C happy

ceggers-arri · gregkh · commit fce04c8b54e4 · 2026-03-25T11:10:39.000+01:00
[ Upstream commit 0e4d4dc ] 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: 6d19628 ("Bluetooth: SMP: Fail if remote and local public keys are identical") Signed-off-by: Christian Eggers <ceggers@arri.de> Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com> Signed-off-by: Sasha Levin <sashal@kernel.org>
diff --git 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);

Original file line number	Diff line number	Diff line change
`@@ -2743,7 +2743,7 @@ static int smp_cmd_public_key(struct l2cap_conn conn, struct sk_buff skb)`
`2743`	`2743`	`if (!test_bit(SMP_FLAG_DEBUG_KEY, &smp->flags) &&`
`2744`	`2744`	`!crypto_memneq(key, smp->local_pk, 64)) {`
`2745`	`2745`	`bt_dev_err(hdev, "Remote and local public keys are identical");`
`2746`		`- return SMP_UNSPECIFIED;`
	`2746`	`+ return SMP_DHKEY_CHECK_FAILED;`
`2747`	`2747`	`}`
`2748`	`2748`
`2749`	`2749`	`memcpy(smp->remote_pk, key, 64);`