From owner-svn-src-head@freebsd.org  Thu May 17 22:40:23 2018
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:2610:1c1:1:606c::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 0635EEE257F;
 Thu, 17 May 2018 22:40:23 +0000 (UTC)
 (envelope-from cognet@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 AC48979E37;
 Thu, 17 May 2018 22:40:22 +0000 (UTC)
 (envelope-from cognet@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 8D6617A37;
 Thu, 17 May 2018 22:40:22 +0000 (UTC)
 (envelope-from cognet@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w4HMeMfR013919;
 Thu, 17 May 2018 22:40:22 GMT (envelope-from cognet@FreeBSD.org)
Received: (from cognet@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id w4HMeM3S013918;
 Thu, 17 May 2018 22:40:22 GMT (envelope-from cognet@FreeBSD.org)
Message-Id: <201805172240.w4HMeM3S013918@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: cognet set sender to
 cognet@FreeBSD.org using -f
From: Olivier Houchard <cognet@FreeBSD.org>
Date: Thu, 17 May 2018 22:40:22 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r333772 - head/sys/arm64/arm64
X-SVN-Group: head
X-SVN-Commit-Author: cognet
X-SVN-Commit-Paths: head/sys/arm64/arm64
X-SVN-Commit-Revision: 333772
X-SVN-Commit-Repository: base
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.26
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: Thu, 17 May 2018 22:40:23 -0000

Author: cognet
Date: Thu May 17 22:40:22 2018
New Revision: 333772
URL: https://svnweb.freebsd.org/changeset/base/333772

Log:
  In pmap_get_tables(), check that the L2 is indeed a table before attempting
  to get the l3.

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

Modified: head/sys/arm64/arm64/pmap.c
==============================================================================
--- head/sys/arm64/arm64/pmap.c	Thu May 17 22:38:16 2018	(r333771)
+++ head/sys/arm64/arm64/pmap.c	Thu May 17 22:40:22 2018	(r333772)
@@ -487,6 +487,9 @@ pmap_get_tables(pmap_t pmap, vm_offset_t va, pd_entry_
 		return (true);
 	}
 
+	if ((pmap_load(l2p) & ATTR_DESCR_MASK) != L2_TABLE)
+		return (false);
+
 	*l3 = pmap_l2_to_l3(l2p, va);
 
 	return (true);