Bluetooth: hci_event: Fix setting DISCOVERY_FINDING for passive scanning

DISCOVERY_FINDING shall only be set for active scanning as passive
scanning is not meant to generate MGMT Device Found events causing
discovering state to go out of sync since userspace would believe it
is discovering when in fact it is just passive scanning.

Cc: stable@vger.kernel.org
Link: https://bugzilla.kernel.org/show_bug.cgi?id=219088
Fixes: 2e2515c1ba38 ("Bluetooth: hci_event: Set DISCOVERY_FINDING on SCAN_ENABLED")
Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>

diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c
index 8a4ebd93adfcd7572f8e481d99be990efed3f153..06da8ac13dca8ef6737a6500f4ef59c1c4e34666 100644 (file)
--- a/net/bluetooth/hci_core.c
+++ b/net/bluetooth/hci_core.c
@@ -119,13 +119,6 @@ void hci_discovery_set_state(struct hci_dev *hdev, int state)
        case DISCOVERY_STARTING:
                break;
        case DISCOVERY_FINDING:
-               /* If discovery was not started then it was initiated by the
-                * MGMT interface so no MGMT event shall be generated either
-                */
-               if (old_state != DISCOVERY_STARTING) {
-                       hdev->discovery.state = old_state;
-                       return;
-               }
                mgmt_discovering(hdev, 1);
                break;
        case DISCOVERY_RESOLVING:

diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c
index dce8035ca7990cfbddbe6a8edf7163fcdad7ee7b..d0c118c47f6c9355d3916c4912f54c930fbf2a94 100644 (file)
--- a/net/bluetooth/hci_event.c
+++ b/net/bluetooth/hci_event.c
@@ -1721,9 +1721,10 @@ static void le_set_scan_enable_complete(struct hci_dev *hdev, u8 enable)
        switch (enable) {
        case LE_SCAN_ENABLE:
                hci_dev_set_flag(hdev, HCI_LE_SCAN);
-               if (hdev->le_scan_type == LE_SCAN_ACTIVE)
+               if (hdev->le_scan_type == LE_SCAN_ACTIVE) {
                        clear_pending_adv_report(hdev);
-               hci_discovery_set_state(hdev, DISCOVERY_FINDING);
+                       hci_discovery_set_state(hdev, DISCOVERY_FINDING);
+               }
                break;
 
        case LE_SCAN_DISABLE: