From owner-p4-projects@FreeBSD.ORG  Fri Feb 22 17:00:47 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 3503616A402; Fri, 22 Feb 2008 17:00:47 +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 B2BFA16A407
	for <perforce@freebsd.org>; Fri, 22 Feb 2008 17:00:46 +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 A640813C457
	for <perforce@freebsd.org>; Fri, 22 Feb 2008 17:00:46 +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 m1MH0kFj030450
	for <perforce@freebsd.org>; Fri, 22 Feb 2008 17:00:46 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m1MH0keN030447
	for perforce@freebsd.org; Fri, 22 Feb 2008 17:00:46 GMT
	(envelope-from sam@freebsd.org)
Date: Fri, 22 Feb 2008 17:00:46 GMT
Message-Id: <200802221700.m1MH0keN030447@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 135971 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, 22 Feb 2008 17:00:47 -0000

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

Change 135971 by sam@sam_ebb on 2008/02/22 17:00:03

	pull check that SA is unicast to common mgt frame processing so
	all frames are checked

Affected files ...

.. //depot/projects/vap/sys/net80211/ieee80211_hostap.c#15 edit

Differences ...

==== //depot/projects/vap/sys/net80211/ieee80211_hostap.c#15 (text+ko) ====

@@ -811,6 +811,14 @@
 			vap->iv_stats.is_rx_tooshort++;
 			goto out;
 		}
+		if (IEEE80211_IS_MULTICAST(wh->i_addr2)) {
+			/* ensure return frames are unicast */
+			IEEE80211_DISCARD(vap, IEEE80211_MSG_ANY,
+			    wh, NULL, "source is multicast: %s",
+			    ether_sprintf(wh->i_addr2));
+			vap->iv_stats.is_rx_mgtdiscard++;	/* XXX stat */
+			goto out;
+		}
 #ifdef IEEE80211_DEBUG
 		if ((ieee80211_msg_debug(vap) && doprint(vap, subtype)) ||
 		    ieee80211_msg_dumppkts(vap)) {
@@ -1742,11 +1750,6 @@
 			vap->iv_stats.is_rx_mgtdiscard++;
 			return;
 		}
-		if (IEEE80211_IS_MULTICAST(wh->i_addr2)) {
-			/* frame must be directed */
-			vap->iv_stats.is_rx_mgtdiscard++;	/* XXX stat */
-			return;
-		}
 
 		/*
 		 * prreq frame format