Bluetooth: clear the temporary linkkey in hci_conn_cleanup

If a hardware error occurs and the connections are flushed without a
disconnection_complete event being signaled, the temporary linkkeys are
not flushed.

This change ensures that any outstanding flushable linkkeys are flushed
when the connection are flushed from the hash table.

Additionally, this also makes use of test_and_clear_bit to avoid
multiple attempts to delete the link key that's already been flushed.

Signed-off-by: Alain Michaud <alainm@chromium.org>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>

diff --git a/net/bluetooth/hci_conn.c b/net/bluetooth/hci_conn.c
index ac06c97..7829433 100644 (file)
--- a/net/bluetooth/hci_conn.c
+++ b/net/bluetooth/hci_conn.c
@@ -118,6 +118,9 @@ static void hci_conn_cleanup(struct hci_conn *conn)
        if (test_bit(HCI_CONN_PARAM_REMOVAL_PEND, &conn->flags))
                hci_conn_params_del(conn->hdev, &conn->dst, conn->dst_type);
 
+       if (test_and_clear_bit(HCI_CONN_FLUSH_KEY, &conn->flags))
+               hci_remove_link_key(hdev, &conn->dst);
+
        hci_chan_list_flush(conn);
 
        hci_conn_hash_del(hdev, conn);

diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c
index af17dfb..63585c0 100644 (file)
--- a/net/bluetooth/hci_event.c
+++ b/net/bluetooth/hci_event.c
@@ -2741,7 +2741,7 @@ static void hci_cs_disconnect(struct hci_dev *hdev, u8 status)
        mgmt_conn = test_and_clear_bit(HCI_CONN_MGMT_CONNECTED, &conn->flags);
 
        if (conn->type == ACL_LINK) {
-               if (test_bit(HCI_CONN_FLUSH_KEY, &conn->flags))
+               if (test_and_clear_bit(HCI_CONN_FLUSH_KEY, &conn->flags))
                        hci_remove_link_key(hdev, &conn->dst);
        }
 
@@ -3368,7 +3368,7 @@ static void hci_disconn_complete_evt(struct hci_dev *hdev, void *data,
                                reason, mgmt_connected);
 
        if (conn->type == ACL_LINK) {
-               if (test_bit(HCI_CONN_FLUSH_KEY, &conn->flags))
+               if (test_and_clear_bit(HCI_CONN_FLUSH_KEY, &conn->flags))
                        hci_remove_link_key(hdev, &conn->dst);
 
                hci_req_update_scan(hdev);