PERFORCE change 72949 for review

[Sam Leffler]

http://perforce.freebsd.org/chv.cgi?CH=72949

Change 72949 by sam at sam_ebb on 2005/03/12 06:10:27

	o reject association requests w/o a wpa/rsn ie when wpa
	  authentication is enabled
	Submitted by:	Divy Le Ray

Affected files ...

.. //depot/projects/vap/sys/net80211/ieee80211_input.c#6 edit

Differences ...

==== //depot/projects/vap/sys/net80211/ieee80211_input.c#6 (text+ko) ====

@@ -2454,6 +2454,23 @@
 			vap->iv_stats.is_rx_assoc_notauth++;
 			return;
 		}
+		if (wpa == NULL && (vap->iv_flags & IEEE80211_F_WPA)) {
+			/*
+			 * When operating with WPA/RSN, there must be
+			 * proper security credentials.
+			 */
+			IEEE80211_DPRINTF(vap,
+			    IEEE80211_MSG_ASSOC | IEEE80211_MSG_WPA,
+			    "[%s] deny %s request, no WPA/RSN ie\n",
+			    ether_sprintf(wh->i_addr2),
+			    reassoc ? "reassoc" : "assoc");
+			IEEE80211_SEND_MGMT(ni,
+			    IEEE80211_FC0_SUBTYPE_DEAUTH,
+			    IEEE80211_REASON_RSN_REQUIRED);
+			ieee80211_node_leave(ni);
+			vap->iv_stats.is_rx_assoc_badwpaie++;	/*XXX*/
+			return;
+		}
 		if (wpa != NULL) {
 			/*
 			 * Parse WPA information element.  Note that