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

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

Bluetooth: Add support for sending New IRK event 



This patch adds the necessary helper function to send the New IRK mgmt
event and makes sure that the function is called at when SMP key
distribution has completed. The event is sent before the New LTK event
so user space knows which remote device to associate with the keys.

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

include/net/bluetooth/hci_core.h

+1 −0
Original line number Diff line number Diff line
@@ -1211,6 +1211,7 @@ void mgmt_discovering(struct hci_dev *hdev, u8 discovering); 
int mgmt_device_blocked(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 type);

int mgmt_device_unblocked(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 type);

void mgmt_new_ltk(struct hci_dev *hdev, struct smp_ltk *key);

void mgmt_new_irk(struct hci_dev *hdev, struct smp_irk *irk);

void mgmt_reenable_advertising(struct hci_dev *hdev);

void mgmt_smp_complete(struct hci_conn *conn, bool complete);

include/net/bluetooth/mgmt.h

+7 −0
Original line number Diff line number Diff line
@@ -536,3 +536,10 @@ struct mgmt_ev_passkey_notify { 
	__le32	passkey;

	__u8	entered;

} __packed;



#define MGMT_EV_NEW_IRK			0x0018

struct mgmt_ev_new_irk {

	__u8     store_hint;

	bdaddr_t rpa;

	struct mgmt_irk_info irk;

} __packed;

net/bluetooth/mgmt.c

+15 −0
Original line number Diff line number Diff line
@@ -4792,6 +4792,21 @@ void mgmt_new_ltk(struct hci_dev *hdev, struct smp_ltk *key) 
	mgmt_event(MGMT_EV_NEW_LONG_TERM_KEY, hdev, &ev, sizeof(ev), NULL);

}



void mgmt_new_irk(struct hci_dev *hdev, struct smp_irk *irk)

{

	struct mgmt_ev_new_irk ev;



	memset(&ev, 0, sizeof(ev));



	ev.store_hint = 0x01;

	bacpy(&ev.rpa, &irk->rpa);

	bacpy(&ev.irk.addr.bdaddr, &irk->bdaddr);

	ev.irk.addr.type = link_to_bdaddr(LE_LINK, irk->addr_type);

	memcpy(ev.irk.val, irk->val, sizeof(irk->val));



	mgmt_event(MGMT_EV_NEW_IRK, hdev, &ev, sizeof(ev), NULL);

}



static inline u16 eir_append_data(u8 *eir, u16 eir_len, u8 type, u8 *data,

				  u8 data_len)

{

net/bluetooth/smp.c

+3 −0
Original line number Diff line number Diff line
@@ -1112,6 +1112,9 @@ static void smp_notify_keys(struct l2cap_conn *conn) 
	struct hci_conn *hcon = conn->hcon;

	struct hci_dev *hdev = hcon->hdev;



	if (smp->remote_irk)

		mgmt_new_irk(hdev, smp->remote_irk);



	if (smp->ltk) {

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

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