diff options
| author | Johan Hedberg | 2014-02-18 20:41:35 +0100 |
|---|---|---|
| committer | Marcel Holtmann | 2014-02-18 20:48:55 +0100 |
| commit | 6cfc9988bd3e5d2931365da76db9b5a7334494b6 (patch) | |
| tree | f395f0ed076bbd49fe2c682e3d3d84cf7cf9c71c /net/bluetooth/hci_core.c | |
| parent | Bluetooth: Wait for SMP key distribution completion when pairing (diff) | |
| download | kernel-qcow2-linux-6cfc9988bd3e5d2931365da76db9b5a7334494b6.tar.gz kernel-qcow2-linux-6cfc9988bd3e5d2931365da76db9b5a7334494b6.tar.xz kernel-qcow2-linux-6cfc9988bd3e5d2931365da76db9b5a7334494b6.zip | |
Bluetooth: Don't try to look up private addresses as Identity Address
Identity Addresses are either public or static random. When looking up
addresses based on the Identity Address it doesn't make sense to go
through the IRK list if we're given a private random address. This patch
fixes (or rather improves) the hci_find_irk_by_addr function to bail out
early if given a private random address.
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'net/bluetooth/hci_core.c')
| -rw-r--r-- | net/bluetooth/hci_core.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c index cdba4709f012..e4c5b9d6083c 100644 --- a/net/bluetooth/hci_core.c +++ b/net/bluetooth/hci_core.c @@ -2662,6 +2662,10 @@ struct smp_irk *hci_find_irk_by_addr(struct hci_dev *hdev, bdaddr_t *bdaddr, { struct smp_irk *irk; + /* Identity Address must be public or static random */ + if (addr_type == ADDR_LE_DEV_RANDOM && (bdaddr->b[5] & 0xc0) != 0xc0) + return NULL; + list_for_each_entry(irk, &hdev->identity_resolving_keys, list) { if (addr_type == irk->addr_type && bacmp(bdaddr, &irk->bdaddr) == 0) |