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

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

Bluetooth: Use __le64 type for LE random numbers 



The random numbers in Bluetooth Low Energy are 64-bit numbers and should
also be little endian since the HCI specification is little endian.

Change the whole Low Energy pairing to use __le64 instead of a byte
array.

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

include/net/bluetooth/hci.h

+2 −2
Original line number Diff line number Diff line
@@ -1234,7 +1234,7 @@ struct hci_cp_le_conn_update { 
#define HCI_OP_LE_START_ENC		0x2019

struct hci_cp_le_start_enc {

	__le16	handle;

	__u8	rand[8];

	__le64	rand;

	__le16	ediv;

	__u8	ltk[16];

} __packed;
@@ -1646,7 +1646,7 @@ struct hci_ev_le_conn_complete { 
#define HCI_EV_LE_LTK_REQ		0x05

struct hci_ev_le_ltk_req {

	__le16	handle;

	__u8	random[8];

	__le64	rand;

	__le16	ediv;

} __packed;

include/net/bluetooth/hci_core.h

+4 −4
Original line number Diff line number Diff line
@@ -99,7 +99,7 @@ struct smp_ltk { 
	u8 type;

	u8 enc_size;

	__le16 ediv;

	u8 rand[8];

	__le64 rand;

	u8 val[16];

};
@@ -828,11 +828,11 @@ void hci_link_keys_clear(struct hci_dev *hdev); 
struct link_key *hci_find_link_key(struct hci_dev *hdev, bdaddr_t *bdaddr);

int hci_add_link_key(struct hci_dev *hdev, struct hci_conn *conn, int new_key,

		     bdaddr_t *bdaddr, u8 *val, u8 type, u8 pin_len);

struct smp_ltk *hci_find_ltk(struct hci_dev *hdev, __le16 ediv, u8 rand[8],

struct smp_ltk *hci_find_ltk(struct hci_dev *hdev, __le16 ediv, __le64 rand,

			     bool master);

struct smp_ltk *hci_add_ltk(struct hci_dev *hdev, bdaddr_t *bdaddr,

			    u8 addr_type, u8 type, u8 authenticated,

			    u8 tk[16], u8 enc_size, __le16 ediv, u8 rand[8]);

			    u8 tk[16], u8 enc_size, __le16 ediv, __le64 rand);

struct smp_ltk *hci_find_ltk_by_addr(struct hci_dev *hdev, bdaddr_t *bdaddr,

				     u8 addr_type, bool master);

int hci_remove_ltk(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 bdaddr_type);
@@ -1293,7 +1293,7 @@ struct hci_sec_filter { 


void hci_le_conn_update(struct hci_conn *conn, u16 min, u16 max,

					u16 latency, u16 to_multiplier);

void hci_le_start_enc(struct hci_conn *conn, __le16 ediv, __u8 rand[8],

void hci_le_start_enc(struct hci_conn *conn, __le16 ediv, __le64 rand,

							__u8 ltk[16]);



int hci_update_random_address(struct hci_request *req, bool require_privacy,

include/net/bluetooth/mgmt.h

+1 −1
Original line number Diff line number Diff line
@@ -187,7 +187,7 @@ struct mgmt_ltk_info { 
	__u8	master;

	__u8	enc_size;

	__le16	ediv;

	__u8	rand[8];

	__le64	rand;

	__u8	val[16];

} __packed;

net/bluetooth/hci_conn.c

+3 −3
Original line number Diff line number Diff line
@@ -231,7 +231,7 @@ void hci_le_conn_update(struct hci_conn *conn, u16 min, u16 max, 
	hci_send_cmd(hdev, HCI_OP_LE_CONN_UPDATE, sizeof(cp), &cp);

}



void hci_le_start_enc(struct hci_conn *conn, __le16 ediv, __u8 rand[8],

void hci_le_start_enc(struct hci_conn *conn, __le16 ediv, __le64 rand,

		      __u8 ltk[16])

{

	struct hci_dev *hdev = conn->hdev;
@@ -242,9 +242,9 @@ void hci_le_start_enc(struct hci_conn *conn, __le16 ediv, __u8 rand[8], 
	memset(&cp, 0, sizeof(cp));



	cp.handle = cpu_to_le16(conn->handle);

	memcpy(cp.ltk, ltk, sizeof(cp.ltk));

	cp.rand = rand;

	cp.ediv = ediv;

	memcpy(cp.rand, rand, sizeof(cp.rand));

	memcpy(cp.ltk, ltk, sizeof(cp.ltk));



	hci_send_cmd(hdev, HCI_OP_LE_START_ENC, sizeof(cp), &cp);

}

net/bluetooth/hci_core.c

+6 −7
Original line number Diff line number Diff line
@@ -765,10 +765,10 @@ static int long_term_keys_show(struct seq_file *f, void *ptr) 
	hci_dev_lock(hdev);

	list_for_each_safe(p, n, &hdev->long_term_keys) {

		struct smp_ltk *ltk = list_entry(p, struct smp_ltk, list);

		seq_printf(f, "%pMR (type %u) %u 0x%02x %u %.4x %*phN %*phN\n",

		seq_printf(f, "%pMR (type %u) %u 0x%02x %u %.4x %.16llx %*phN\n",

			   &ltk->bdaddr, ltk->bdaddr_type, ltk->authenticated,

			   ltk->type, ltk->enc_size, __le16_to_cpu(ltk->ediv),

			   8, ltk->rand, 16, ltk->val);

			   __le64_to_cpu(ltk->rand), 16, ltk->val);

	}

	hci_dev_unlock(hdev);
@@ -2921,14 +2921,13 @@ static bool ltk_type_master(u8 type) 
	return false;

}



struct smp_ltk *hci_find_ltk(struct hci_dev *hdev, __le16 ediv, u8 rand[8],

struct smp_ltk *hci_find_ltk(struct hci_dev *hdev, __le16 ediv, __le64 rand,

			     bool master)

{

	struct smp_ltk *k;



	list_for_each_entry(k, &hdev->long_term_keys, list) {

		if (k->ediv != ediv ||

		    memcmp(rand, k->rand, sizeof(k->rand)))

		if (k->ediv != ediv || k->rand != rand)

			continue;



		if (ltk_type_master(k->type) != master)
@@ -3046,7 +3045,7 @@ int hci_add_link_key(struct hci_dev *hdev, struct hci_conn *conn, int new_key, 


struct smp_ltk *hci_add_ltk(struct hci_dev *hdev, bdaddr_t *bdaddr,

			    u8 addr_type, u8 type, u8 authenticated,

			    u8 tk[16], u8 enc_size, __le16 ediv, u8 rand[8])

			    u8 tk[16], u8 enc_size, __le16 ediv, __le64 rand)

{

	struct smp_ltk *key, *old_key;

	bool master = ltk_type_master(type);
@@ -3066,9 +3065,9 @@ struct smp_ltk *hci_add_ltk(struct hci_dev *hdev, bdaddr_t *bdaddr, 
	memcpy(key->val, tk, sizeof(key->val));

	key->authenticated = authenticated;

	key->ediv = ediv;

	key->rand = rand;

	key->enc_size = enc_size;

	key->type = type;

	memcpy(key->rand, rand, sizeof(key->rand));



	return key;

}