RSN: Stop 4-way handshake if scan results are not available

While there may have initially been cases where the RSNE from
Beacon/Probe Response frames was not available from some drivers, it is
now more valuable to notice if such a case were to be hit with drivers
that are always expected to have such information available. As such,
make it a fatal error if the scan results for the current AP are not
available to check the RSNE/RSNXE in EAPOL-Key msg 3/4.

Signed-off-by: Jouni Malinen <j@w1.fi>

diff --git a/src/rsn_supp/wpa.c b/src/rsn_supp/wpa.c
index 39bc13d716295821fed06340dbbbcc540a782e7e..5bb47bcbe1c025ba956d3088fc5432db593c119a 100644 (file)
--- a/src/rsn_supp/wpa.c
+++ b/src/rsn_supp/wpa.c
@@ -1424,11 +1424,10 @@ static int wpa_supplicant_validate_ie(struct wpa_sm *sm,
                        wpa_msg(sm->ctx->msg_ctx, MSG_WARNING,
                                "WPA: Could not find AP from "
                                "the scan results");
-               } else {
-                       wpa_msg(sm->ctx->msg_ctx, MSG_DEBUG,
-                               "WPA: Found the current AP from "
-                               "updated scan results");
+                       return -1;
                }
+               wpa_msg(sm->ctx->msg_ctx, MSG_DEBUG,
+                       "WPA: Found the current AP from updated scan results");
        }
 
        if (ie->wpa_ie == NULL && ie->rsn_ie == NULL &&