From owner-svn-src-all@freebsd.org  Wed Apr 13 21:00:01 2016
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@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 7C1B5B0EAE5;
 Wed, 13 Apr 2016 21:00:01 +0000 (UTC)
 (envelope-from emaste@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 4CDA21044;
 Wed, 13 Apr 2016 21:00:01 +0000 (UTC)
 (envelope-from emaste@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u3DL00g3091064;
 Wed, 13 Apr 2016 21:00:00 GMT (envelope-from emaste@FreeBSD.org)
Received: (from emaste@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u3DL003Q091063;
 Wed, 13 Apr 2016 21:00:00 GMT (envelope-from emaste@FreeBSD.org)
Message-Id: <201604132100.u3DL003Q091063@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: emaste set sender to
 emaste@FreeBSD.org using -f
From: Ed Maste <emaste@FreeBSD.org>
Date: Wed, 13 Apr 2016 21:00:00 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r297940 - head/sys/arm64/arm64
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.21
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 13 Apr 2016 21:00:01 -0000

Author: emaste
Date: Wed Apr 13 21:00:00 2016
New Revision: 297940
URL: https://svnweb.freebsd.org/changeset/base/297940

Log:
  arm64: Avoid null dereference in its_init_cpu
  
  its_init_cpu() is called from gic_v3_init_secondary(), and its_sc will
  be NULL if its did not attach.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  head/sys/arm64/arm64/gic_v3_its.c

Modified: head/sys/arm64/arm64/gic_v3_its.c
==============================================================================
--- head/sys/arm64/arm64/gic_v3_its.c	Wed Apr 13 20:55:05 2016	(r297939)
+++ head/sys/arm64/arm64/gic_v3_its.c	Wed Apr 13 21:00:00 2016	(r297940)
@@ -565,7 +565,7 @@ its_init_cpu(struct gic_v3_its_softc *sc
 	 * this function was called during GICv3 secondary initialization.
 	 */
 	if (sc == NULL) {
-		if (device_is_attached(its_sc->dev)) {
+		if (its_sc != NULL && device_is_attached(its_sc->dev)) {
 			/*
 			 * XXX ARM64TODO: This is part of the workaround that
 			 * saves ITS software context for further use in