From: Johan Hedberg Date: Thu, 11 Sep 2014 05:16:35 +0000 (-0700) Subject: Bluetooth: Expire RPA if encryption fails X-Git-Tag: v3.18-rc1~115^2~144^2~49^2~1 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=7ed3fa20780a5efd22bb192be0908468e7c376ed;p=karo-tx-linux.git 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 Signed-off-by: Marcel Holtmann --- 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) {