From owner-svn-src-head@freebsd.org  Mon Sep 19 22:11:36 2016
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 00CD7BE0AD6;
 Mon, 19 Sep 2016 22:11:36 +0000 (UTC)
 (envelope-from ivadasz@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id C4203D71;
 Mon, 19 Sep 2016 22:11:35 +0000 (UTC)
 (envelope-from ivadasz@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u8JMBYLY071120;
 Mon, 19 Sep 2016 22:11:34 GMT (envelope-from ivadasz@FreeBSD.org)
Received: (from ivadasz@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u8JMBY4K071119;
 Mon, 19 Sep 2016 22:11:34 GMT (envelope-from ivadasz@FreeBSD.org)
Message-Id: <201609192211.u8JMBY4K071119@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ivadasz set sender to
 ivadasz@FreeBSD.org using -f
From: =?UTF-8?Q?Imre_Vad=c3=a1sz?= <ivadasz@FreeBSD.org>
Date: Mon, 19 Sep 2016 22:11:34 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r306001 - head/sys/dev/iwm
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 19 Sep 2016 22:11:36 -0000

Author: ivadasz
Date: Mon Sep 19 22:11:34 2016
New Revision: 306001
URL: https://svnweb.freebsd.org/changeset/base/306001

Log:
  [iwm] Fix off-by-one check in iwm_read_firmware().
  
  This fixes a potential buffer overrun in the firmware parsing code.
  
  Reported by:	Coverity
  Approved by:	adrian (mentor)
  Differential Revision:	https://reviews.freebsd.org/D7931

Modified:
  head/sys/dev/iwm/if_iwm.c

Modified: head/sys/dev/iwm/if_iwm.c
==============================================================================
--- head/sys/dev/iwm/if_iwm.c	Mon Sep 19 22:08:47 2016	(r306000)
+++ head/sys/dev/iwm/if_iwm.c	Mon Sep 19 22:11:34 2016	(r306001)
@@ -739,7 +739,7 @@ iwm_read_firmware(struct iwm_softc *sc, 
 			}
 			capa = (const struct iwm_ucode_capa *)tlv_data;
 			idx = le32toh(capa->api_index);
-			if (idx > howmany(IWM_NUM_UCODE_TLV_CAPA, 32)) {
+			if (idx >= howmany(IWM_NUM_UCODE_TLV_CAPA, 32)) {
 				device_printf(sc->sc_dev,
 				    "unsupported API index %d\n", idx);
 				goto parse_out;