From owner-svn-src-stable@FreeBSD.ORG  Sat Mar 17 06:49:54 2012
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 41771106566C;
	Sat, 17 Mar 2012 06:49:54 +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 300F38FC15;
	Sat, 17 Mar 2012 06:49:54 +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 q2H6nsYk054881;
	Sat, 17 Mar 2012 06:49:54 GMT (envelope-from iwasaki@svn.freebsd.org)
Received: (from iwasaki@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q2H6nr6S054879;
	Sat, 17 Mar 2012 06:49:53 GMT (envelope-from iwasaki@svn.freebsd.org)
Message-Id: <201203170649.q2H6nr6S054879@svn.freebsd.org>
From: Mitsuru IWASAKI <iwasaki@FreeBSD.org>
Date: Sat, 17 Mar 2012 06:49:53 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r233078 - stable/8/sys/dev/iwi
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 17 Mar 2012 06:49:54 -0000

Author: iwasaki
Date: Sat Mar 17 06:49:53 2012
New Revision: 233078
URL: http://svn.freebsd.org/changeset/base/233078

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

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

Modified: stable/8/sys/dev/iwi/if_iwi.c
==============================================================================
--- stable/8/sys/dev/iwi/if_iwi.c	Sat Mar 17 06:48:13 2012	(r233077)
+++ stable/8/sys/dev/iwi/if_iwi.c	Sat Mar 17 06:49:53 2012	(r233078)
@@ -1355,8 +1355,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))