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

Commit 94ea7257 authored by Johan Hedberg's avatar Johan Hedberg Committed by Marcel Holtmann
Browse files

Bluetooth: Fix verifying confirm value when lacking remote OOB data 



If we haven't received remote OOB data we cannot perform any special
checks on the confirm value. This patch updates the check after having
received the public key to only perform the verification if we have
remote OOB data present.

Signed-off-by: default avatarJohan Hedberg <johan.hedberg@intel.com>
Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
parent 58428563

net/bluetooth/smp.c

+3 −1
Original line number Diff line number Diff line
@@ -2562,7 +2562,7 @@ static int smp_cmd_public_key(struct l2cap_conn *conn, struct sk_buff *skb) 
		return sc_passkey_round(smp, SMP_CMD_PUBLIC_KEY);

	}



	if (smp->method == REQ_OOB) {

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

		err = smp_f4(smp->tfm_cmac, smp->remote_pk, smp->remote_pk,

			     smp->rr, 0, cfm.confirm_val);

		if (err)
@@ -2570,7 +2570,9 @@ static int smp_cmd_public_key(struct l2cap_conn *conn, struct sk_buff *skb) 


		if (memcmp(cfm.confirm_val, smp->pcnf, 16))

			return SMP_CONFIRM_FAILED;

	}



	if (smp->method == REQ_OOB) {

		if (hcon->out)

			smp_send_cmd(conn, SMP_CMD_PAIRING_RANDOM,

				     sizeof(smp->prnd), smp->prnd);