From owner-svn-src-all@FreeBSD.ORG  Wed Jul 23 14:29:29 2014
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 23C7117C;
 Wed, 23 Jul 2014 14:29:29 +0000 (UTC)
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 10FC221B6;
 Wed, 23 Jul 2014 14:29:29 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s6NETSGm089814;
 Wed, 23 Jul 2014 14:29:28 GMT (envelope-from emaste@svn.freebsd.org)
Received: (from emaste@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s6NETSf5089813;
 Wed, 23 Jul 2014 14:29:28 GMT (envelope-from emaste@svn.freebsd.org)
Message-Id: <201407231429.s6NETSf5089813@svn.freebsd.org>
From: Ed Maste <emaste@FreeBSD.org>
Date: Wed, 23 Jul 2014 14:29:28 +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: r269013 - stable/10/lib/libkvm
X-SVN-Group: stable-10
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.18
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: <http://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: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 23 Jul 2014 14:29:29 -0000

Author: emaste
Date: Wed Jul 23 14:29:28 2014
New Revision: 269013
URL: http://svnweb.freebsd.org/changeset/base/269013

Log:
  MFC r261799: Add bounds check for pteindex / pdeindex to amd64 kvm_minidump

Modified:
  stable/10/lib/libkvm/kvm_minidump_amd64.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/lib/libkvm/kvm_minidump_amd64.c
==============================================================================
--- stable/10/lib/libkvm/kvm_minidump_amd64.c	Wed Jul 23 14:27:04 2014	(r269012)
+++ stable/10/lib/libkvm/kvm_minidump_amd64.c	Wed Jul 23 14:29:28 2014	(r269013)
@@ -214,6 +214,8 @@ _kvm_minidump_vatop_v1(kvm_t *kd, u_long
 
 	if (va >= vm->hdr.kernbase) {
 		pteindex = (va - vm->hdr.kernbase) >> PAGE_SHIFT;
+		if (pteindex >= vm->hdr.pmapsize / sizeof(*vm->page_map))
+			goto invalid;
 		pte = vm->page_map[pteindex];
 		if (((u_long)pte & PG_V) == 0) {
 			_kvm_err(kd, kd->program, "_kvm_vatop: pte not valid");
@@ -264,6 +266,8 @@ _kvm_minidump_vatop(kvm_t *kd, u_long va
 
 	if (va >= vm->hdr.kernbase) {
 		pdeindex = (va - vm->hdr.kernbase) >> PDRSHIFT;
+		if (pdeindex >= vm->hdr.pmapsize / sizeof(*vm->page_map))
+			goto invalid;
 		pde = vm->page_map[pdeindex];
 		if (((u_long)pde & PG_V) == 0) {
 			_kvm_err(kd, kd->program, "_kvm_vatop: pde not valid");