From owner-p4-projects@FreeBSD.ORG  Fri Mar 28 21:17:28 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 5EFD51065676; Fri, 28 Mar 2008 21:17:28 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id EFF7C1065670
	for <perforce@freebsd.org>; Fri, 28 Mar 2008 21:17:27 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id DEB008FC17
	for <perforce@freebsd.org>; Fri, 28 Mar 2008 21:17:27 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2SLHRgi036874
	for <perforce@freebsd.org>; Fri, 28 Mar 2008 21:17:27 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2SLHRNG036872
	for perforce@freebsd.org; Fri, 28 Mar 2008 21:17:27 GMT
	(envelope-from sam@freebsd.org)
Date: Fri, 28 Mar 2008 21:17:27 GMT
Message-Id: <200803282117.m2SLHRNG036872@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	sam@freebsd.org using -f
From: Sam Leffler <sam@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 138857 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: Fri, 28 Mar 2008 21:17:28 -0000

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

Change 138857 by sam@sam_ebb on 2008/03/28 21:17:11

	close races between mlme ops and the rx path; this introduces
	at least one LOR that will need to be sorted out with the
	locking problem

Affected files ...

.. //depot/projects/vap/sys/net80211/ieee80211_ioctl.c#47 edit

Differences ...

==== //depot/projects/vap/sys/net80211/ieee80211_ioctl.c#47 (text+ko) ====

@@ -1271,6 +1271,7 @@
 	const uint8_t mac[IEEE80211_ADDR_LEN], int reason)
 {
 	struct ieee80211com *ic = vap->iv_ic;
+	struct ieee80211_node_table *nt = &ic->ic_sta;
 	struct ieee80211_node *ni;
 	struct mlmeop mlmeop;
 	int error;
@@ -1289,9 +1290,10 @@
 			mlmeop.vap = vap;
 			mlmeop.op = op;
 			mlmeop.reason = reason;
+			IEEE80211_NODE_LOCK(nt);
 			/* NB: the broadcast address means do 'em all */
 			if (!IEEE80211_ADDR_EQ(mac, ic->ic_ifp->if_broadcastaddr)) {
-				ni = ieee80211_find_node(&ic->ic_sta, mac);
+				ni = ieee80211_find_node_locked(nt, mac);
 				if (ni != NULL) {
 					domlme(&mlmeop, ni);
 					ieee80211_free_node(ni);
@@ -1301,6 +1303,7 @@
 				ieee80211_iterate_nodes(&ic->ic_sta,
 						domlme, &mlmeop);
 			}
+			IEEE80211_NODE_UNLOCK(nt);
 			break;
 		case IEEE80211_M_WDS:
 			/* XXX user app should send raw frame? */
@@ -1333,6 +1336,7 @@
 			error = EINVAL;
 			break;
 		}
+		IEEE80211_NODE_LOCK(nt);
 		ni = ieee80211_find_vap_node(&ic->ic_sta, vap, mac);
 		if (ni != NULL) {
 			mlmedebug(vap, mac, op, reason);
@@ -1343,12 +1347,14 @@
 			ieee80211_free_node(ni);
 		} else
 			error = ENOENT;
+		IEEE80211_NODE_UNLOCK(nt);
 		break;
 	case IEEE80211_MLME_AUTH:
 		if (vap->iv_opmode != IEEE80211_M_HOSTAP) {
 			error = EINVAL;
 			break;
 		}
+		IEEE80211_NODE_LOCK(nt);
 		ni = ieee80211_find_vap_node(&ic->ic_sta, vap, mac);
 		if (ni != NULL) {
 			mlmedebug(vap, mac, op, reason);
@@ -1373,6 +1379,7 @@
 			ieee80211_free_node(ni);
 		} else
 			error = ENOENT;
+		IEEE80211_NODE_UNLOCK(nt);
 		break;
 	default:
 		error = EINVAL;