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

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

Bluetooth: Fix removing any IRKs when unpairing devices 



When mgmt_unpair_device is called we should also remove any associated
IRKs. This patch adds a hci_remove_irk convenience function and ensures
that it's called when mgmt_unpair_device is called.

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

include/net/bluetooth/hci_core.h

+1 −0
Original line number Diff line number Diff line
@@ -801,6 +801,7 @@ struct smp_irk *hci_find_irk_by_addr(struct hci_dev *hdev, bdaddr_t *bdaddr, 
				     u8 addr_type);

int hci_add_irk(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 addr_type,

		u8 val[16], bdaddr_t *rpa);

void hci_remove_irk(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 addr_type);

void hci_smp_irks_clear(struct hci_dev *hdev);



void hci_remote_oob_data_clear(struct hci_dev *hdev);

net/bluetooth/hci_core.c

+15 −0
Original line number Diff line number Diff line
@@ -2823,6 +2823,21 @@ int hci_remove_ltk(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 bdaddr_type) 
	return removed ? 0 : -ENOENT;

}



void hci_remove_irk(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 addr_type)

{

	struct smp_irk *k, *tmp;



	list_for_each_entry_safe(k, tmp, &hdev->long_term_keys, list) {

		if (bacmp(bdaddr, &k->bdaddr) || k->addr_type != addr_type)

			continue;



		BT_DBG("%s removing %pMR", hdev->name, bdaddr);



		list_del(&k->list);

		kfree(k);

	}

}



/* HCI command timer function */

static void hci_cmd_timeout(unsigned long arg)

{

net/bluetooth/mgmt.c

+2 −0
Original line number Diff line number Diff line
@@ -2328,6 +2328,8 @@ static int unpair_device(struct sock *sk, struct hci_dev *hdev, void *data, 
		else

			addr_type = ADDR_LE_DEV_RANDOM;



		hci_remove_irk(hdev, &cp->addr.bdaddr, addr_type);



		err = hci_remove_ltk(hdev, &cp->addr.bdaddr, addr_type);

	}