2 files changed, 11 insertions, 2 deletions

diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c
index 3c81b5cdda83..8b3f839ba826 100644
--- a/net/bluetooth/hci_core.c
+++ b/net/bluetooth/hci_core.c
@@ -4255,6 +4255,7 @@ void hci_unregister_dev(struct hci_dev *hdev)
         hci_remote_oob_data_clear(hdev);
         hci_bdaddr_list_clear(&hdev->le_white_list);
         hci_conn_params_clear_all(hdev);
+        hci_discovery_filter_clear(hdev);
         hci_dev_unlock(hdev);
 
         hci_dev_put(hdev);
diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c
index 104c4cc921da..74571a4b85ec 100644
--- a/net/bluetooth/mgmt.c
+++ b/net/bluetooth/mgmt.c
@@ -3870,9 +3870,12 @@ static int start_discovery(struct sock *sk, struct hci_dev *hdev,
                 goto failed;
         }
 
+        /* Clear the discovery filter first to free any previously
+         * allocated memory for the UUID list.
+         */
+        hci_discovery_filter_clear(hdev);
+
         hdev->discovery.type = cp->type;
-        hdev->discovery.rssi = HCI_RSSI_INVALID;
-        hdev->discovery.uuid_count = 0;
 
         hci_req_init(&req, hdev);
 
@@ -3957,6 +3960,11 @@ static int start_service_discovery(struct sock *sk, struct hci_dev *hdev,
                 goto failed;
         }
 
+        /* Clear the discovery filter first to free any previously
+         * allocated memory for the UUID list.
+         */
+        hci_discovery_filter_clear(hdev);
+
         hdev->discovery.type = cp->type;
         hdev->discovery.rssi = cp->rssi;
         hdev->discovery.uuid_count = uuid_count;