From 1446afc86579a3340fde2e6c827f804037183e82 Mon Sep 17 00:00:00 2001 From: Ilan Peer Date: Mon, 29 Feb 2016 14:30:01 +0200 Subject: [PATCH] wpa_supplicant: Handle EVENT_SCAN_RESULTS when an interface is disabled An interface can be disabled while it has an ongoing scan request. In such a case, when the scan results notification is received, it was being ignored (as the interface is already disabled) so the scan state was not cleared. This can cause undetermined behavior for the next scan request. To handle this, clear the scan state when EVENT_SCAN_RESULTS is received and the interface is disabled. Signed-off-by: Ilan Peer --- wpa_supplicant/events.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/wpa_supplicant/events.c b/wpa_supplicant/events.c index db0051589..c39315d35 100644 --- a/wpa_supplicant/events.c +++ b/wpa_supplicant/events.c @@ -3343,6 +3343,7 @@ void wpa_supplicant_event(void *ctx, enum wpa_event_type event, if (wpa_s->wpa_state == WPA_INTERFACE_DISABLED && event != EVENT_INTERFACE_ENABLED && event != EVENT_INTERFACE_STATUS && + event != EVENT_SCAN_RESULTS && event != EVENT_SCHED_SCAN_STOPPED) { wpa_dbg(wpa_s, MSG_DEBUG, "Ignore event %s (%d) while interface is disabled", @@ -3429,6 +3430,14 @@ void wpa_supplicant_event(void *ctx, enum wpa_event_type event, } break; case EVENT_SCAN_RESULTS: + if (wpa_s->wpa_state == WPA_INTERFACE_DISABLED) { + wpa_s->scan_res_handler = NULL; + wpa_s->own_scan_running = 0; + wpa_s->radio->external_scan_running = 0; + wpa_s->last_scan_req = NORMAL_SCAN_REQ; + break; + } + if (!(data && data->scan_info.external_scan) && os_reltime_initialized(&wpa_s->scan_start_time)) { struct os_reltime now, diff;