svn commit: r336495 - vendor/wpa/dist/wpa_supplicant

[Cy Schubert]

Author: cy
Date: Thu Jul 19 17:46:33 2018
New Revision: 336495
URL: https://svnweb.freebsd.org/changeset/base/336495

Log:
  Import upline security patch:  WNM: Ignore WNM-Sleep Mode Request in
  wnm_sleep_mode=0 case. This is also upline git commit
  114f2830d2c2aee6db23d48240e93415a256a37c.
  
  Obtained from:	https://w1.fi/security/2017-1/\
  		rebased-v2.6-0007-WNM-Ignore-WNM-Sleep-Mode-\
  		Response-without-pending-r.patch

Modified:
  vendor/wpa/dist/wpa_supplicant/wnm_sta.c

Modified: vendor/wpa/dist/wpa_supplicant/wnm_sta.c
==============================================================================
--- vendor/wpa/dist/wpa_supplicant/wnm_sta.c	Thu Jul 19 17:37:13 2018	(r336494)
+++ vendor/wpa/dist/wpa_supplicant/wnm_sta.c	Thu Jul 19 17:46:33 2018	(r336495)
@@ -260,7 +260,7 @@ static void ieee802_11_rx_wnmsleep_resp(struct wpa_sup
 
 	if (!wpa_s->wnmsleep_used) {
 		wpa_printf(MSG_DEBUG,
-			   "WNM: Ignore WNM-Sleep Mode Response frame since WNM-Sleep Mode has not been used in this association");
+			   "WNM: Ignore WNM-Sleep Mode Response frame since WNM-Sleep Mode operation has not been requested");
 		return;
 	}
 
@@ -298,6 +298,8 @@ static void ieee802_11_rx_wnmsleep_resp(struct wpa_sup
 		wpa_printf(MSG_DEBUG, "No WNM-Sleep IE found");
 		return;
 	}
+
+	wpa_s->wnmsleep_used = 0;
 
 	if (wnmsleep_ie->status == WNM_STATUS_SLEEP_ACCEPT ||
 	    wnmsleep_ie->status == WNM_STATUS_SLEEP_EXIT_ACCEPT_GTK_UPDATE) {