From owner-p4-projects@FreeBSD.ORG  Fri Jan 11 20:53:53 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 1D55616A468; Fri, 11 Jan 2008 20:53:53 +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 D71C016A41A
	for <perforce@freebsd.org>; Fri, 11 Jan 2008 20:53:52 +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 CB80C13C447
	for <perforce@freebsd.org>; Fri, 11 Jan 2008 20:53:52 +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 m0BKrqQG079647
	for <perforce@freebsd.org>; Fri, 11 Jan 2008 20:53:52 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0BKrqFa079644
	for perforce@freebsd.org; Fri, 11 Jan 2008 20:53:52 GMT
	(envelope-from sam@freebsd.org)
Date: Fri, 11 Jan 2008 20:53:52 GMT
Message-Id: <200801112053.m0BKrqFa079644@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 133066 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, 11 Jan 2008 20:53:53 -0000

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

Change 133066 by sam@sam_ebb on 2008/01/11 20:53:40

	avoid potential null ptr deref
	Submitted by:	cbz

Affected files ...

.. //depot/projects/vap/sys/net80211/ieee80211_input.h#2 edit

Differences ...

==== //depot/projects/vap/sys/net80211/ieee80211_input.h#2 (text+ko) ====

@@ -34,8 +34,7 @@
 		    wh, NULL, "%s", "no " #__elem );			\
 		vap->iv_stats.is_rx_elem_missing++;			\
 		_action;						\
-	}								\
-	if ((__elem)[1] > (__maxlen)) {					\
+	} else if ((__elem)[1] > (__maxlen)) {				\
 		IEEE80211_DISCARD(vap, IEEE80211_MSG_ELEMID,		\
 		    wh, NULL, "bad " #__elem " len %d", (__elem)[1]);	\
 		vap->iv_stats.is_rx_elem_toobig++;			\