Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 30126d4b authored by Luiz Augusto von Dentz's avatar Luiz Augusto von Dentz Committed by Greg Kroah-Hartman
Browse files

Bluetooth: SMP: Fail if remote and local public keys are identical 



commit 6d19628f539fccf899298ff02ee4c73e4bf6df3f upstream.

This fails the pairing procedure when both remote and local non-debug
public keys are identical.

Signed-off-by: default avatarLuiz Augusto von Dentz <luiz.von.dentz@intel.com>
Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 1dfd47b6

net/bluetooth/smp.c

+9 −0
Original line number Diff line number Diff line
@@ -2703,6 +2703,15 @@ static int smp_cmd_public_key(struct l2cap_conn *conn, struct sk_buff *skb) 
	if (skb->len < sizeof(*key))

		return SMP_INVALID_PARAMS;



	/* Check if remote and local public keys are the same and debug key is

	 * not in use.

	 */

	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;

	}



	memcpy(smp->remote_pk, key, 64);



	if (test_bit(SMP_FLAG_REMOTE_OOB, &smp->flags)) {