From owner-svn-src-stable-9@FreeBSD.ORG  Sat Mar 17 06:48:14 2012
Return-Path: <owner-svn-src-stable-9@FreeBSD.ORG>
Delivered-To: svn-src-stable-9@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 95B841065670;
	Sat, 17 Mar 2012 06:48:14 +0000 (UTC)
	(envelope-from iwasaki@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 8455B8FC0A;
	Sat, 17 Mar 2012 06:48:14 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q2H6mElg054791;
	Sat, 17 Mar 2012 06:48:14 GMT (envelope-from iwasaki@svn.freebsd.org)
Received: (from iwasaki@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q2H6mE9V054789;
	Sat, 17 Mar 2012 06:48:14 GMT (envelope-from iwasaki@svn.freebsd.org)
Message-Id: <201203170648.q2H6mE9V054789@svn.freebsd.org>
From: Mitsuru IWASAKI <iwasaki@FreeBSD.org>
Date: Sat, 17 Mar 2012 06:48:14 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r233077 - stable/9/sys/dev/iwi
X-BeenThere: svn-src-stable-9@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 9-stable src tree
	<svn-src-stable-9.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
	<mailto:svn-src-stable-9-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-9>
List-Post: <mailto:svn-src-stable-9@freebsd.org>
List-Help: <mailto:svn-src-stable-9-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
	<mailto:svn-src-stable-9-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 17 Mar 2012 06:48:14 -0000

Author: iwasaki
Date: Sat Mar 17 06:48:13 2012
New Revision: 233077
URL: http://svn.freebsd.org/changeset/base/233077

Log:
  MFC r232785
  
  Fix wrong asresp frame parsing in iwi_checkforqos().

Modified:
  stable/9/sys/dev/iwi/if_iwi.c

Modified: stable/9/sys/dev/iwi/if_iwi.c
==============================================================================
--- stable/9/sys/dev/iwi/if_iwi.c	Sat Mar 17 05:45:21 2012	(r233076)
+++ stable/9/sys/dev/iwi/if_iwi.c	Sat Mar 17 06:48:13 2012	(r233077)
@@ -1357,8 +1357,8 @@ iwi_checkforqos(struct ieee80211vap *vap
 	frm += 2;
 
 	wme = NULL;
-	while (frm < efrm) {
-		IEEE80211_VERIFY_LENGTH(efrm - frm, frm[1], return);
+	while (efrm - frm > 1) {
+		IEEE80211_VERIFY_LENGTH(efrm - frm, frm[1] + 2, return);
 		switch (*frm) {
 		case IEEE80211_ELEMID_VENDOR:
 			if (iswmeoui(frm))