From c3dc68e84427942d4cf6026893499d2c04eca946 Mon Sep 17 00:00:00 2001 From: Jouni Malinen Date: Wed, 16 Mar 2016 19:44:32 +0200 Subject: [PATCH] Do not invalidate EAP session cache on all network block parameter changes The bssid and priority parameters in a network block do not have any effect on the validity of an EAP session entry, so avoid flushing the cached session when only these parameters are changed. This is mainly to allow forced roaming or network selection changes without causing fast reauthentication to be disabled if the changes are done during RSN association that used EAP. Signed-off-by: Jouni Malinen --- wpa_supplicant/ctrl_iface.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/wpa_supplicant/ctrl_iface.c b/wpa_supplicant/ctrl_iface.c index 4e1698713..6be938582 100644 --- a/wpa_supplicant/ctrl_iface.c +++ b/wpa_supplicant/ctrl_iface.c @@ -2976,15 +2976,17 @@ static int wpa_supplicant_ctrl_iface_update_network( } if (os_strcmp(name, "bssid") != 0 && - os_strcmp(name, "priority") != 0) + os_strcmp(name, "priority") != 0) { wpa_sm_pmksa_cache_flush(wpa_s->wpa, ssid); - if (wpa_s->current_ssid == ssid || wpa_s->current_ssid == NULL) { - /* - * Invalidate the EAP session cache if anything in the current - * or previously used configuration changes. - */ - eapol_sm_invalidate_cached_session(wpa_s->eapol); + if (wpa_s->current_ssid == ssid || + wpa_s->current_ssid == NULL) { + /* + * Invalidate the EAP session cache if anything in the + * current or previously used configuration changes. + */ + eapol_sm_invalidate_cached_session(wpa_s->eapol); + } } if ((os_strcmp(name, "psk") == 0 &&