From owner-svn-src-stable@freebsd.org  Wed Feb 14 21:39:11 2018
Return-Path: <owner-svn-src-stable@freebsd.org>
Delivered-To: svn-src-stable@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 6C174F22AB0;
 Wed, 14 Feb 2018 21:39:11 +0000 (UTC)
 (envelope-from gonzo@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 224736EDC4;
 Wed, 14 Feb 2018 21:39:11 +0000 (UTC)
 (envelope-from gonzo@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 191031568A;
 Wed, 14 Feb 2018 21:39:11 +0000 (UTC)
 (envelope-from gonzo@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w1ELdArD042365;
 Wed, 14 Feb 2018 21:39:10 GMT (envelope-from gonzo@FreeBSD.org)
Received: (from gonzo@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id w1ELdAHl042364;
 Wed, 14 Feb 2018 21:39:10 GMT (envelope-from gonzo@FreeBSD.org)
Message-Id: <201802142139.w1ELdAHl042364@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: gonzo set sender to
 gonzo@FreeBSD.org using -f
From: Oleksandr Tymoshenko <gonzo@FreeBSD.org>
Date: Wed, 14 Feb 2018 21:39:10 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org
Subject: svn commit: r329280 - stable/11/sys/arm/arm
X-SVN-Group: stable-11
X-SVN-Commit-Author: gonzo
X-SVN-Commit-Paths: stable/11/sys/arm/arm
X-SVN-Commit-Revision: 329280
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/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: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 14 Feb 2018 21:39:11 -0000

Author: gonzo
Date: Wed Feb 14 21:39:10 2018
New Revision: 329280
URL: https://svnweb.freebsd.org/changeset/base/329280

Log:
  MFC r320387:
  
  [arm] Use correct index value when checking range validity
  
  Reviewed by:	andrew
  Differential Revision:	https://reviews.freebsd.org/D9145

Modified:
  stable/11/sys/arm/arm/gic.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/arm/arm/gic.c
==============================================================================
--- stable/11/sys/arm/arm/gic.c	Wed Feb 14 21:17:44 2018	(r329279)
+++ stable/11/sys/arm/arm/gic.c	Wed Feb 14 21:39:10 2018	(r329280)
@@ -1656,11 +1656,11 @@ arm_gicv2m_alloc_msi(device_t dev, device_t child, int
 				break;
 			}
 
-			KASSERT((psc->gic_irqs[irq].gi_flags & GI_FLAG_MSI)!= 0,
+			KASSERT((psc->gic_irqs[end_irq].gi_flags & GI_FLAG_MSI)!= 0,
 			    ("%s: Non-MSI interrupt found", __func__));
 
 			/* This is already used */
-			if ((psc->gic_irqs[irq].gi_flags & GI_FLAG_MSI_USED) ==
+			if ((psc->gic_irqs[end_irq].gi_flags & GI_FLAG_MSI_USED) ==
 			    GI_FLAG_MSI_USED) {
 				found = false;
 				break;