From owner-p4-projects@FreeBSD.ORG  Tue Feb 13 15:00:44 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id A582116A478; Tue, 13 Feb 2007 15:00:44 +0000 (UTC)
X-Original-To: perforce@FreeBSD.org
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 7405916A476
	for <perforce@FreeBSD.org>; Tue, 13 Feb 2007 15:00:44 +0000 (UTC)
	(envelope-from sephe@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.freebsd.org (Postfix) with ESMTP id 68ECB13C4B3
	for <perforce@FreeBSD.org>; Tue, 13 Feb 2007 15:00:44 +0000 (UTC)
	(envelope-from sephe@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l1DF0iP5043544
	for <perforce@FreeBSD.org>; Tue, 13 Feb 2007 15:00:44 GMT
	(envelope-from sephe@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l1DF0ih5043541
	for perforce@freebsd.org; Tue, 13 Feb 2007 15:00:44 GMT
	(envelope-from sephe@FreeBSD.org)
Date: Tue, 13 Feb 2007 15:00:44 GMT
Message-Id: <200702131500.l1DF0ih5043541@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	sephe@FreeBSD.org using -f
From: Sepherosa Ziehau <sephe@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 114453 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 13 Feb 2007 15:00:45 -0000

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

Change 114453 by sephe@sephe_zealot:sam_wifi on 2007/02/13 15:00:22

	- Avoid 'goto' within 'switch' statement.
	- Strip trailing white space.
	- Correct two typos, which leads to possible NULL dereference.

Affected files ...

.. //depot/projects/wifi/sys/net80211/ieee80211_input.c#83 edit

Differences ...

==== //depot/projects/wifi/sys/net80211/ieee80211_input.c#83 (text+ko) ====

@@ -2467,6 +2467,7 @@
 		u_int16_t capinfo, lintval;
 		struct ieee80211_rsnparms rsnparms;
 		u_int8_t reason;
+		int badwparsn;
 
 		if (ic->ic_opmode != IEEE80211_M_HOSTAP ||
 		    ic->ic_state != IEEE80211_S_RUN) {
@@ -2549,20 +2550,22 @@
 			return;
 		}
 		/* assert right association security credentials */
+		badwparsn = 0;
 		switch (ic->ic_flags & IEEE80211_F_WPA) {
 		case IEEE80211_F_WPA1:
 			if (wpa == NULL)
-				goto badwparsn;
+				badwparsn = 1;
 			break;
 		case IEEE80211_F_WPA2:
 			if (rsn == NULL)
-				goto badwparsn;
+				badwparsn = 1;
 			break;
 		case IEEE80211_F_WPA1|IEEE80211_F_WPA2:
-			if (wpa != NULL || rsn != NULL)
-				break;
-			/* fall thru... */
-		badwparsn:
+			if (wpa == NULL && rsn == NULL)
+				badwparsn = 1;
+			break;
+		}
+		if (badwparsn) {
 			IEEE80211_DPRINTF(ic,
 			    IEEE80211_MSG_ASSOC | IEEE80211_MSG_WPA,
 			    "[%s] no WPA/RSN IE in association request\n",
@@ -2572,7 +2575,7 @@
 			    IEEE80211_REASON_RSN_REQUIRED);
 			ieee80211_node_leave(ic, ni);
 			ic->ic_stats.is_rx_assoc_badwpaie++;
-			return;	
+			return;
 		}
 		if (wpa != NULL || rsn != NULL) {
 			/*
@@ -2586,7 +2589,7 @@
 			if (wpa != NULL)
 				reason = ieee80211_parse_wpa(ic, wpa, &rsnparms, wh);
 			else
-				reason = ieee80211_parse_rsn(ic, wpa, &rsnparms, wh);
+				reason = ieee80211_parse_rsn(ic, rsn, &rsnparms, wh);
 			if (reason != 0) {
 				IEEE80211_SEND_MGMT(ic, ni,
 				    IEEE80211_FC0_SUBTYPE_DEAUTH, reason);
@@ -2673,7 +2676,7 @@
 			 */
 			ni->ni_rsn = rsnparms;
 			ieee80211_saveie(&ni->ni_rsn_ie, rsn);
-		} else if (ni->ni_wpa_ie != NULL) {
+		} else if (ni->ni_rsn_ie != NULL) {
 			/*
 			 * Flush any state from a previous association.
 			 */