From owner-svn-src-stable-10@FreeBSD.ORG  Wed May 27 13:23:03 2015
Return-Path: <owner-svn-src-stable-10@FreeBSD.ORG>
Delivered-To: svn-src-stable-10@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id A6EB83C3;
 Wed, 27 May 2015 13:23:03 +0000 (UTC)
 (envelope-from hselasky@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::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 94330A3;
 Wed, 27 May 2015 13:23:03 +0000 (UTC)
 (envelope-from hselasky@FreeBSD.org)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t4RDN3Bx088768;
 Wed, 27 May 2015 13:23:03 GMT (envelope-from hselasky@FreeBSD.org)
Received: (from hselasky@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t4RDN38U088767;
 Wed, 27 May 2015 13:23:03 GMT (envelope-from hselasky@FreeBSD.org)
Message-Id: <201505271323.t4RDN38U088767@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: hselasky set sender to
 hselasky@FreeBSD.org using -f
From: Hans Petter Selasky <hselasky@FreeBSD.org>
Date: Wed, 27 May 2015 13:23:03 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r283609 - stable/10/sys/dev/sound/pci/hda
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable-10@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for only the 10-stable src tree
 <svn-src-stable-10.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable-10>, 
 <mailto:svn-src-stable-10-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-10/>
List-Post: <mailto:svn-src-stable-10@freebsd.org>
List-Help: <mailto:svn-src-stable-10-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10>, 
 <mailto:svn-src-stable-10-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 27 May 2015 13:23:03 -0000

Author: hselasky
Date: Wed May 27 13:23:02 2015
New Revision: 283609
URL: https://svnweb.freebsd.org/changeset/base/283609

Log:
  MFC r283064:
  Fix an off-by-one error by adding proper range checks when parsing the
  HDA association descriptors. This fixes a crash during device probe
  for some HDA PCI devices.

Modified:
  stable/10/sys/dev/sound/pci/hda/hdaa.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/dev/sound/pci/hda/hdaa.c
==============================================================================
--- stable/10/sys/dev/sound/pci/hda/hdaa.c	Wed May 27 12:58:22 2015	(r283608)
+++ stable/10/sys/dev/sound/pci/hda/hdaa.c	Wed May 27 13:23:02 2015	(r283609)
@@ -3203,7 +3203,7 @@ hdaa_audio_as_parse(struct hdaa_devinfo 
 
 	/* Scan associations skipping as=0. */
 	cnt = 0;
-	for (j = 1; j < 16; j++) {
+	for (j = 1; j < 16 && cnt < max; j++) {
 		first = 16;
 		hpredir = 0;
 		for (i = devinfo->startnode; i < devinfo->endnode; i++) {