summaryrefslogtreecommitdiffstats
path: root/net/bluetooth
diff options
context:
space:
mode:
authorJohan Hedberg <johan.hedberg@intel.com>2014-09-10 22:16:35 -0700
committerMarcel Holtmann <marcel@holtmann.org>2014-09-11 07:32:14 +0200
commit7ed3fa20780a5efd22bb192be0908468e7c376ed (patch)
treef4668edced6d8cee6b047834e48aa815dc65e552 /net/bluetooth
parent5be5e275ad214bbb420425754354add679d8ab68 (diff)
downloadlinux-7ed3fa20780a5efd22bb192be0908468e7c376ed.tar.gz
linux-7ed3fa20780a5efd22bb192be0908468e7c376ed.tar.bz2
linux-7ed3fa20780a5efd22bb192be0908468e7c376ed.zip
Bluetooth: Expire RPA if encryption fails
If encryption fails and we're using an RPA it may be because of a conflict with another device. To avoid repeated failures the safest action is to simply mark the RPA as expired so that a new one gets generated as soon as the connection drops. Signed-off-by: Johan Hedberg <johan.hedberg@intel.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'net/bluetooth')
-rw-r--r--net/bluetooth/hci_event.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c
index 603a17cc52ac..8b0a2a6de419 100644
--- a/net/bluetooth/hci_event.c
+++ b/net/bluetooth/hci_event.c
@@ -2438,6 +2438,12 @@ static void hci_encrypt_change_evt(struct hci_dev *hdev, struct sk_buff *skb)
}
}
+ /* We should disregard the current RPA and generate a new one
+ * whenever the encryption procedure fails.
+ */
+ if (ev->status && conn->type == LE_LINK)
+ set_bit(HCI_RPA_EXPIRED, &hdev->dev_flags);
+
clear_bit(HCI_CONN_ENCRYPT_PEND, &conn->flags);
if (ev->status && conn->state == BT_CONNECTED) {