From owner-p4-projects@FreeBSD.ORG  Sat Jan 10 21:32:01 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id EC37B16A4D2; Sat, 10 Jan 2004 21:32:00 -0800 (PST)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id C5BE216A4D0
	for <perforce@freebsd.org>; Sat, 10 Jan 2004 21:32:00 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id DF30243D2F
	for <perforce@freebsd.org>; Sat, 10 Jan 2004 21:31:59 -0800 (PST)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i0B5Vx0B066343
	for <perforce@freebsd.org>; Sat, 10 Jan 2004 21:31:59 -0800 (PST)
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i0B5Vxgp066335
	for perforce@freebsd.org; Sat, 10 Jan 2004 21:31:59 -0800 (PST)
	(envelope-from sam@freebsd.org)
Date: Sat, 10 Jan 2004 21:31:59 -0800 (PST)
Message-Id: <200401110531.i0B5Vxgp066335@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>
Subject: PERFORCE change 45108 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
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: Sun, 11 Jan 2004 05:32:01 -0000

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

Change 45108 by sam@sam_ebb on 2004/01/10 21:31:47

	correct bounds checking of 802.11 mtu

Affected files ...

.. //depot/projects/netperf+sockets/sys/net80211/ieee80211.h#4 edit
.. //depot/projects/netperf+sockets/sys/net80211/ieee80211_ioctl.c#6 edit

Differences ...

==== //depot/projects/netperf+sockets/sys/net80211/ieee80211.h#4 (text+ko) ====

@@ -427,7 +427,16 @@
 
 #define	IEEE80211_CRC_LEN			4
 
-#define	IEEE80211_MTU				1500
+/*
+ * Maximum acceptable MTU is:
+ *	IEEE80211_MAX_LEN - WEP overhead - CRC -
+ *		QoS overhead - RSN/WPA overhead
+ * Min is arbitrarily chosen > IEEE80211_MIN_LEN.  The default
+ * mtu is Ethernet-compatible; it's set by ether_ifattach.
+ */
+#define	IEEE80211_MTU_MAX			2290
+#define	IEEE80211_MTU_MIN			32
+
 #define	IEEE80211_MAX_LEN			(2300 + IEEE80211_CRC_LEN + \
     (IEEE80211_WEP_IVLEN + IEEE80211_WEP_KIDLEN + IEEE80211_WEP_CRCLEN))
 #define	IEEE80211_MIN_LEN \

==== //depot/projects/netperf+sockets/sys/net80211/ieee80211_ioctl.c#6 (text+ko) ====

@@ -1098,7 +1098,8 @@
 		break;
 	case SIOCSIFMTU:
 		ifr = (struct ifreq *)data;
-		if (ifr->ifr_mtu > IEEE80211_MTU)
+		if (!(IEEE80211_MTU_MIN >= ifr->ifr_mtu &&
+		    ifr->ifr_mtu <= IEEE80211_MTU_MAX))
 			error = EINVAL;
 		else
 			ifp->if_mtu = ifr->ifr_mtu;