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

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

Bluetooth: Move SMP LTK notification after key distribution 



This patch moves the SMP Long Term Key notification over mgmt from the
hci_add_ltk function to smp.c when both sides have completed their key
distribution. This way we are also able to update the identity address
into the mgmt_new_ltk event.

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

include/net/bluetooth/hci_core.h

+2 −3
Original line number Diff line number Diff line
@@ -788,9 +788,8 @@ int hci_add_link_key(struct hci_dev *hdev, struct hci_conn *conn, int new_key, 
struct smp_ltk *hci_find_ltk(struct hci_dev *hdev, __le16 ediv, u8 rand[8],

			     bool master);

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

			    u8 addr_type, u8 type, int new_key,

			    u8 authenticated, u8 tk[16], u8 enc_size,

			    __le16 ediv, u8 rand[8]);

			    u8 addr_type, u8 type, u8 authenticated,

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

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);

net/bluetooth/hci_core.c

+2 −9
Original line number Diff line number Diff line
@@ -2762,9 +2762,8 @@ 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, int new_key,

			    u8 authenticated, u8 tk[16], u8 enc_size,

			    __le16 ediv, u8 rand[8])

			    u8 addr_type, u8 type, u8 authenticated,

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

{

	struct smp_ltk *key, *old_key;

	bool master = ltk_type_master(type);
@@ -2788,12 +2787,6 @@ struct smp_ltk *hci_add_ltk(struct hci_dev *hdev, bdaddr_t *bdaddr, 
	key->type = type;

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



	if (!new_key)

		return key;



	if (type == HCI_SMP_LTK || type == HCI_SMP_LTK_SLAVE)

		mgmt_new_ltk(hdev, key);



	return key;

}

net/bluetooth/mgmt.c

+3 −3
Original line number Diff line number Diff line
@@ -4330,9 +4330,9 @@ static int load_long_term_keys(struct sock *sk, struct hci_dev *hdev, 
		else

			type = HCI_SMP_LTK_SLAVE;



		hci_add_ltk(hdev, &key->addr.bdaddr, addr_type,

			    type, 0, key->type, key->val,

			    key->enc_size, key->ediv, key->rand);

		hci_add_ltk(hdev, &key->addr.bdaddr, addr_type, type,

			    key->type, key->val, key->enc_size, key->ediv,

			    key->rand);

	}



	err = cmd_complete(sk, hdev->id, MGMT_OP_LOAD_LONG_TERM_KEYS, 0,

net/bluetooth/smp.c

+24 −5
Original line number Diff line number Diff line
@@ -532,7 +532,7 @@ static void random_work(struct work_struct *work) 
		       SMP_MAX_ENC_KEY_SIZE - smp->enc_key_size);



		hci_add_ltk(hcon->hdev, &hcon->dst, hcon->dst_type,

			    HCI_SMP_STK_SLAVE, 0, 0, stk, smp->enc_key_size,

			    HCI_SMP_STK_SLAVE, 0, stk, smp->enc_key_size,

			    ediv, rand);

	}
@@ -931,7 +931,7 @@ static int smp_cmd_master_ident(struct l2cap_conn *conn, struct sk_buff *skb) 


	hci_dev_lock(hdev);

	authenticated = (hcon->sec_level == BT_SECURITY_HIGH);

	ltk = hci_add_ltk(hdev, &hcon->dst, hcon->dst_type, HCI_SMP_LTK, 1,

	ltk = hci_add_ltk(hdev, &hcon->dst, hcon->dst_type, HCI_SMP_LTK,

			  authenticated, smp->tk, smp->enc_key_size,

			  rp->ediv, rp->rand);

	smp->ltk = ltk;
@@ -1106,6 +1106,25 @@ done: 
	return err;

}



static void smp_notify_keys(struct l2cap_conn *conn)

{

	struct smp_chan *smp = conn->smp_chan;

	struct hci_conn *hcon = conn->hcon;

	struct hci_dev *hdev = hcon->hdev;



	if (smp->ltk) {

		smp->ltk->bdaddr_type = hcon->dst_type;

		bacpy(&smp->ltk->bdaddr, &hcon->dst);

		mgmt_new_ltk(hdev, smp->ltk);

	}



	if (smp->slave_ltk) {

		smp->slave_ltk->bdaddr_type = hcon->dst_type;

		bacpy(&smp->slave_ltk->bdaddr, &hcon->dst);

		mgmt_new_ltk(hdev, smp->slave_ltk);

	}

}



int smp_distribute_keys(struct l2cap_conn *conn, __u8 force)

{

	struct smp_cmd_pairing *req, *rsp;
@@ -1151,9 +1170,8 @@ int smp_distribute_keys(struct l2cap_conn *conn, __u8 force) 


		authenticated = hcon->sec_level == BT_SECURITY_HIGH;

		ltk = hci_add_ltk(hcon->hdev, &hcon->dst, hcon->dst_type,

				  HCI_SMP_LTK_SLAVE, 1, authenticated,

				  enc.ltk, smp->enc_key_size, ediv,

				  ident.rand);

				  HCI_SMP_LTK_SLAVE, authenticated, enc.ltk,

				  smp->enc_key_size, ediv, ident.rand);

		smp->slave_ltk = ltk;



		ident.ediv = ediv;
@@ -1197,6 +1215,7 @@ int smp_distribute_keys(struct l2cap_conn *conn, __u8 force) 
		clear_bit(HCI_CONN_LE_SMP_PEND, &conn->hcon->flags);

		cancel_delayed_work_sync(&conn->security_timer);

		set_bit(SMP_FLAG_COMPLETE, &smp->smp_flags);

		smp_notify_keys(conn);

		smp_chan_destroy(conn);

	}