Date: Wed, 23 Jul 2014 14:29:28 +0000 (UTC) From: Ed Maste <emaste@FreeBSD.org> 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 Message-ID: <201407231429.s6NETSf5089813@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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");
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201407231429.s6NETSf5089813>