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

Commit 861580a9 authored by Johan Hedberg's avatar Johan Hedberg Committed by Marcel Holtmann
Browse files

Bluetooth: Update smp_random to return a response code 



Since we're now calling smp_random() "inline" we can have it directly
return a response code and have the shared command handler send the
response.

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

net/bluetooth/smp.c

+11 −23
Original line number Diff line number Diff line
@@ -503,19 +503,17 @@ static void smp_confirm(struct smp_chan *smp) 
	smp_failure(conn, reason);

}



static void smp_random(struct smp_chan *smp)

static u8 smp_random(struct smp_chan *smp)

{

	struct l2cap_conn *conn = smp->conn;

	struct hci_conn *hcon = conn->hcon;

	struct hci_dev *hdev = hcon->hdev;

	struct crypto_blkcipher *tfm = hdev->tfm_aes;

	u8 reason, confirm[16];

	u8 confirm[16];

	int ret;



	if (IS_ERR_OR_NULL(tfm)) {

		reason = SMP_UNSPECIFIED;

		goto error;

	}

	if (IS_ERR_OR_NULL(tfm))

		return SMP_UNSPECIFIED;



	BT_DBG("conn %p %s", conn, conn->hcon->out ? "master" : "slave");
@@ -528,15 +526,12 @@ static void smp_random(struct smp_chan *smp) 


	hci_dev_unlock(hdev);



	if (ret) {

		reason = SMP_UNSPECIFIED;

		goto error;

	}

	if (ret)

		return SMP_UNSPECIFIED;



	if (memcmp(smp->pcnf, confirm, sizeof(smp->pcnf)) != 0) {

		BT_ERR("Pairing failed (confirmation values mismatch)");

		reason = SMP_CONFIRM_FAILED;

		goto error;

		return SMP_CONFIRM_FAILED;

	}



	if (hcon->out) {
@@ -549,10 +544,8 @@ static void smp_random(struct smp_chan *smp) 
		memset(stk + smp->enc_key_size, 0,

		       SMP_MAX_ENC_KEY_SIZE - smp->enc_key_size);



		if (test_and_set_bit(HCI_CONN_ENCRYPT_PEND, &hcon->flags)) {

			reason = SMP_UNSPECIFIED;

			goto error;

		}

		if (test_and_set_bit(HCI_CONN_ENCRYPT_PEND, &hcon->flags))

			return SMP_UNSPECIFIED;



		hci_le_start_enc(hcon, ediv, rand, stk);

		hcon->enc_key_size = smp->enc_key_size;
@@ -574,10 +567,7 @@ static void smp_random(struct smp_chan *smp) 
			    ediv, rand);

	}



	return;



error:

	smp_failure(conn, reason);

	return 0;

}



static struct smp_chan *smp_chan_create(struct l2cap_conn *conn)
@@ -815,9 +805,7 @@ static u8 smp_cmd_pairing_random(struct l2cap_conn *conn, struct sk_buff *skb) 
	memcpy(smp->rrnd, skb->data, sizeof(smp->rrnd));

	skb_pull(skb, sizeof(smp->rrnd));



	smp_random(smp);



	return 0;

	return smp_random(smp);

}



static u8 smp_ltk_encrypt(struct l2cap_conn *conn, u8 sec_level)