Bluetooth: protect le accept and resolv lists with hdev->lock

Concurrent operations from events on le_{accept,resolv}_list are
currently unprotected by hdev->lock.
Most existing code do already protect the lists with that lock.
This can be observed in hci_debugfs and hci_sync.
Add the protection for these events too.

Fixes: b950aa88638c ("Bluetooth: Add definitions and track LE resolve list modification")
Fixes: 0f36b589e4ee ("Bluetooth: Track LE white list modification via HCI commands")
Signed-off-by: Niels Dossche <dossche.niels@gmail.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>

diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c
index a835ce6f843087635e1a7c4496c66c3f1877833a..0270e597c285230cef718122cd23d659e5d5110a 100644 (file)
--- a/net/bluetooth/hci_event.c
+++ b/net/bluetooth/hci_event.c
@@ -1835,7 +1835,9 @@ static u8 hci_cc_le_clear_accept_list(struct hci_dev *hdev, void *data,
        if (rp->status)
                return rp->status;
 
+       hci_dev_lock(hdev);
        hci_bdaddr_list_clear(&hdev->le_accept_list);
+       hci_dev_unlock(hdev);
 
        return rp->status;
 }
@@ -1855,8 +1857,10 @@ static u8 hci_cc_le_add_to_accept_list(struct hci_dev *hdev, void *data,
        if (!sent)
                return rp->status;
 
+       hci_dev_lock(hdev);
        hci_bdaddr_list_add(&hdev->le_accept_list, &sent->bdaddr,
                            sent->bdaddr_type);
+       hci_dev_unlock(hdev);
 
        return rp->status;
 }
@@ -1876,8 +1880,10 @@ static u8 hci_cc_le_del_from_accept_list(struct hci_dev *hdev, void *data,
        if (!sent)
                return rp->status;
 
+       hci_dev_lock(hdev);
        hci_bdaddr_list_del(&hdev->le_accept_list, &sent->bdaddr,
                            sent->bdaddr_type);
+       hci_dev_unlock(hdev);
 
        return rp->status;
 }
@@ -1949,9 +1955,11 @@ static u8 hci_cc_le_add_to_resolv_list(struct hci_dev *hdev, void *data,
        if (!sent)
                return rp->status;
 
+       hci_dev_lock(hdev);
        hci_bdaddr_list_add_with_irk(&hdev->le_resolv_list, &sent->bdaddr,
                                sent->bdaddr_type, sent->peer_irk,
                                sent->local_irk);
+       hci_dev_unlock(hdev);
 
        return rp->status;
 }
@@ -1971,8 +1979,10 @@ static u8 hci_cc_le_del_from_resolv_list(struct hci_dev *hdev, void *data,
        if (!sent)
                return rp->status;
 
+       hci_dev_lock(hdev);
        hci_bdaddr_list_del_with_irk(&hdev->le_resolv_list, &sent->bdaddr,
                            sent->bdaddr_type);
+       hci_dev_unlock(hdev);
 
        return rp->status;
 }
@@ -1987,7 +1997,9 @@ static u8 hci_cc_le_clear_resolv_list(struct hci_dev *hdev, void *data,
        if (rp->status)
                return rp->status;
 
+       hci_dev_lock(hdev);
        hci_bdaddr_list_clear(&hdev->le_resolv_list);
+       hci_dev_unlock(hdev);
 
        return rp->status;
 }