From: Andriy Tkachuk <andriy.v.tkachuk@globallogic.com>
Date: Wed, 11 Nov 2009 15:33:55 +0000 (+0200)
Subject: Disassociate STA if it associated with invalid/missing WPA/RSN IE
X-Git-Tag: hostap_0_7_0~67
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=355d36a7bf5b14df80e3f73d71b9089008fd517b;p=thirdparty%2Fhostap.git

Disassociate STA if it associated with invalid/missing WPA/RSN IE

When using drivers that process management frames internally (e.g.,
madwifi, atheros, bsd), the driver may accept association with IEs
that do not match the security policy. Instead of silently leaving
the station associated, explicitly disassociate it to clear the
driver entry immediately.
---

diff --git a/hostapd/drv_callbacks.c b/hostapd/drv_callbacks.c
index 6c940b5eb..c6480f32f 100644
--- a/hostapd/drv_callbacks.c
+++ b/hostapd/drv_callbacks.c
@@ -284,9 +284,26 @@ int hostapd_notif_assoc(struct hostapd_data *hapd, const u8 *addr,
 		res = wpa_validate_wpa_ie(hapd->wpa_auth, sta->wpa_sm,
 					  ie, ielen, NULL, 0);
 		if (res != WPA_IE_OK) {
+			int resp;
 			wpa_printf(MSG_DEBUG, "WPA/RSN information element "
 				   "rejected? (res %u)", res);
 			wpa_hexdump(MSG_DEBUG, "IE", ie, ielen);
+			if (res == WPA_INVALID_GROUP)
+				resp = WLAN_REASON_GROUP_CIPHER_NOT_VALID;
+			else if (res == WPA_INVALID_PAIRWISE)
+				resp = WLAN_REASON_PAIRWISE_CIPHER_NOT_VALID;
+			else if (res == WPA_INVALID_AKMP)
+				resp = WLAN_REASON_AKMP_NOT_VALID;
+#ifdef CONFIG_IEEE80211W
+			else if (res == WPA_MGMT_FRAME_PROTECTION_VIOLATION)
+				resp = WLAN_REASON_INVALID_IE;
+			else if (res == WPA_INVALID_MGMT_GROUP_CIPHER)
+				resp = WLAN_REASON_GROUP_CIPHER_NOT_VALID;
+#endif /* CONFIG_IEEE80211W */
+			else
+				resp = WLAN_REASON_INVALID_IE;
+			hostapd_sta_disassoc(hapd, sta->addr, resp);
+			ap_free_sta(hapd, sta);
 			return -1;
 		}
 	} else if (hapd->conf->wps_state) {