From owner-p4-projects@FreeBSD.ORG  Tue Mar 27 14:21:30 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 6854B16A403; Tue, 27 Mar 2007 14:21:30 +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 3A3B516A401
	for <perforce@FreeBSD.org>; Tue, 27 Mar 2007 14:21:30 +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 2B6D613C457
	for <perforce@FreeBSD.org>; Tue, 27 Mar 2007 14:21:30 +0000 (UTC)
	(envelope-from sephe@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l2RELUQ9033693
	for <perforce@FreeBSD.org>; Tue, 27 Mar 2007 14:21:30 GMT
	(envelope-from sephe@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l2RELTWR033687
	for perforce@freebsd.org; Tue, 27 Mar 2007 14:21:29 GMT
	(envelope-from sephe@FreeBSD.org)
Date: Tue, 27 Mar 2007 14:21:29 GMT
Message-Id: <200703271421.l2RELTWR033687@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 116647 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, 27 Mar 2007 14:21:30 -0000

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

Change 116647 by sephe@sephe_zealot:sam_wifi on 2007/03/27 14:21:05

	Make sure that the size of xrate+rate ie does not exceed the maxium
	that net80211 can support.
	
	Reviewed-by: sam@

Affected files ...

.. //depot/projects/wifi/sys/net80211/ieee80211_input.c#96 edit
.. //depot/projects/wifi/sys/net80211/ieee80211_scan_sta.c#16 edit

Differences ...

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

@@ -2102,6 +2102,10 @@
 			frm += frm[1] + 2;
 		}
 		IEEE80211_VERIFY_ELEMENT(scan.rates, IEEE80211_RATE_MAXSIZE);
+		if (scan.xrates != NULL) {
+			IEEE80211_VERIFY_ELEMENT(scan.xrates,
+				IEEE80211_RATE_MAXSIZE - scan.rates[1]);
+		}
 		IEEE80211_VERIFY_ELEMENT(scan.ssid, IEEE80211_NWID_LEN);
 #if IEEE80211_CHAN_MAX < 255
 		if (scan.chan > IEEE80211_CHAN_MAX) {
@@ -2342,6 +2346,10 @@
 			frm += frm[1] + 2;
 		}
 		IEEE80211_VERIFY_ELEMENT(rates, IEEE80211_RATE_MAXSIZE);
+		if (xrates != NULL) {
+			IEEE80211_VERIFY_ELEMENT(xrates,
+				IEEE80211_RATE_MAXSIZE - rates[1]);
+		}
 		IEEE80211_VERIFY_ELEMENT(ssid, IEEE80211_NWID_LEN);
 		IEEE80211_VERIFY_SSID(ic->ic_bss, ssid);
 		if ((ic->ic_flags & IEEE80211_F_HIDESSID) && ssid[1] == 0) {
@@ -2534,6 +2542,10 @@
 			frm += frm[1] + 2;
 		}
 		IEEE80211_VERIFY_ELEMENT(rates, IEEE80211_RATE_MAXSIZE);
+		if (xrates != NULL) {
+			IEEE80211_VERIFY_ELEMENT(xrates,
+				IEEE80211_RATE_MAXSIZE - rates[1]);
+		}
 		IEEE80211_VERIFY_ELEMENT(ssid, IEEE80211_NWID_LEN);
 		IEEE80211_VERIFY_SSID(ic->ic_bss, ssid);
 
@@ -2778,6 +2790,10 @@
 		}
 
 		IEEE80211_VERIFY_ELEMENT(rates, IEEE80211_RATE_MAXSIZE);
+		if (xrates != NULL) {
+			IEEE80211_VERIFY_ELEMENT(xrates,
+				IEEE80211_RATE_MAXSIZE - rates[1]);
+		}
 		rate = ieee80211_setup_rates(ni, rates, xrates,
 				IEEE80211_F_JOIN |
 				IEEE80211_F_DOSORT | IEEE80211_F_DOFRATE |

==== //depot/projects/wifi/sys/net80211/ieee80211_scan_sta.c#16 (text+ko) ====

@@ -244,7 +244,7 @@
 	memcpy(ise->se_rates, sp->rates, 2+sp->rates[1]);
 	if (sp->xrates != NULL) {
 		/* XXX validate xrates[1] */
-		KASSERT(sp->xrates[1] <= IEEE80211_RATE_MAXSIZE,
+		KASSERT(sp->xrates[1] + sp->rates[1] <= IEEE80211_RATE_MAXSIZE,
 			("xrate set too large: %u", sp->xrates[1]));
 		memcpy(ise->se_xrates, sp->xrates, 2+sp->xrates[1]);
 	} else