diff options
| author | emaste <emaste@FreeBSD.org> | 2014-07-23 14:29:28 +0000 |
|---|---|---|
| committer | emaste <emaste@FreeBSD.org> | 2014-07-23 14:29:28 +0000 |
| commit | 68543b825eebc8f694e1463a03bfde0c02ac0e89 (patch) | |
| tree | 2917c54393b71db4b225aeec6019bd01be61052f | |
| parent | e220614cf98ffd5291de82cd30bb58b2688e2d29 (diff) | |
| download | FreeBSD-src-68543b825eebc8f694e1463a03bfde0c02ac0e89.zip FreeBSD-src-68543b825eebc8f694e1463a03bfde0c02ac0e89.tar.gz | |
MFC r261799: Add bounds check for pteindex / pdeindex to amd64 kvm_minidump
| -rw-r--r-- | lib/libkvm/kvm_minidump_amd64.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/libkvm/kvm_minidump_amd64.c b/lib/libkvm/kvm_minidump_amd64.c index 8d31673..779fa97 100644 --- a/lib/libkvm/kvm_minidump_amd64.c +++ b/lib/libkvm/kvm_minidump_amd64.c @@ -214,6 +214,8 @@ _kvm_minidump_vatop_v1(kvm_t *kd, u_long va, off_t *pa) 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, off_t *pa) 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"); |
