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

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

Bluetooth: Fix hci_remove_ltk failure when no match is found 



There is code (in mgmt.c) that depends on the hci_remove_ltk function to
fail if no match is found. This patch adds tracking of removed LTKs
(there can be up to two: one for master and another for slave) in the
hci_remove_ltk function and returns -ENOENT of no matches were found.

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

net/bluetooth/hci_core.c

+3 −1
Original line number Diff line number Diff line
@@ -2807,6 +2807,7 @@ int hci_remove_link_key(struct hci_dev *hdev, bdaddr_t *bdaddr) 
int hci_remove_ltk(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 bdaddr_type)

{

	struct smp_ltk *k, *tmp;

	int removed = 0;



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

		if (bacmp(bdaddr, &k->bdaddr) || k->bdaddr_type != bdaddr_type)
@@ -2816,9 +2817,10 @@ int hci_remove_ltk(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 bdaddr_type) 


		list_del(&k->list);

		kfree(k);

		removed++;

	}



	return 0;

	return removed ? 0 : -ENOENT;

}



/* HCI command timer function */