From owner-p4-projects@FreeBSD.ORG  Thu Jan 31 06:18:32 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 8EB1F16A524; Thu, 31 Jan 2008 06:18:32 +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 15C0E16A419
	for <perforce@freebsd.org>; Thu, 31 Jan 2008 06:18:32 +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 F307313C468
	for <perforce@freebsd.org>; Thu, 31 Jan 2008 06:18:31 +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 m0V6IVH5074568
	for <perforce@freebsd.org>; Thu, 31 Jan 2008 06:18:31 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0V6IVeJ074565
	for perforce@freebsd.org; Thu, 31 Jan 2008 06:18:31 GMT
	(envelope-from sam@freebsd.org)
Date: Thu, 31 Jan 2008 06:18:31 GMT
Message-Id: <200801310618.m0V6IVeJ074565@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 134525 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: Thu, 31 Jan 2008 06:18:32 -0000

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

Change 134525 by sam@sam_ebb on 2008/01/31 06:18:26

	sanity-check the country ie before parsing

Affected files ...

.. //depot/projects/vap/sys/net80211/ieee80211_scan.c#14 edit

Differences ...

==== //depot/projects/vap/sys/net80211/ieee80211_scan.c#14 (text+ko) ====

@@ -1020,6 +1020,10 @@
 	   (const struct ieee80211_country_ie *) ie;
 	int i, nbands, schan, nchan;
 
+	if (cie->len < 3) {
+		printf(" <bogus country ie, len %d>", cie->len);
+		return;
+	}
 	printf(" country [%c%c%c", cie->cc[0], cie->cc[1], cie->cc[2]);
 	nbands = (cie->len - 3) / sizeof(cie->band[0]);
 	for (i = 0; i < nbands; i++) {