Commit 893edede authored Aug 08, 2014 by Johan Hedberg Committed by Marcel Holtmann Aug 14, 2014

Bluetooth: Fix IRK lookup when tfm_aes is not available

If the AES crypto has not been initialized properly we should cleanly
return from the hci_find_irk_by_rpa() function. Right now this will not
happen in practice, but once (in subsequent patches) SMP init is moved
to after the HCI init procedure it is possible that the pointer is NULL.

Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>

parent fabed38f

net/bluetooth/hci_core.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -3232,6 +3232,9 @@ struct smp_irk hci_find_irk_by_rpa(struct hci_dev hdev, bdaddr_t *rpa)
		return irk;
		}

		if (!hdev->tfm_aes)
		return NULL;

		list_for_each_entry(irk, &hdev->identity_resolving_keys, list) {
		if (smp_irk_matches(hdev->tfm_aes, irk->val, rpa)) {
		bacpy(&irk->rpa, rpa);