Author: jhb
Date: Tue Nov 17 16:51:49 2009
New Revision: 199410
URL: http://svn.freebsd.org/changeset/base/199410
Log:
MFC 198986:
Fix a copy-paste bug when reading data from the last 3 (7 for PAE) bytes of
a page mapped by a large page in the kernel.
Modified:
stable/6/lib/libkvm/kvm_i386.c
Directory Properties:
stable/6/lib/libkvm/ (props changed)
Modified: stable/6/lib/libkvm/kvm_i386.c
==============================================================================
--- stable/6/lib/libkvm/kvm_i386.c Tue Nov 17 16:51:38 2009
(r199409)
+++ stable/6/lib/libkvm/kvm_i386.c Tue Nov 17 16:51:49 2009
(r199410)
@@ -289,9 +289,9 @@ _kvm_vatop(kvm_t *kd, u_long va, off_t *
#define PG_FRAME4M (~PAGE4M_MASK)
pde_pa = ((u_long)pde & PG_FRAME4M) + (va & PAGE4M_MASK);
s = _kvm_pa2off(kd, pde_pa, &ofs);
- if (s < sizeof pde) {
- _kvm_syserr(kd, kd->program,
- "_kvm_vatop: pde_pa not found");
+ if (s == 0) {
+ _kvm_err(kd, kd->program,
+ "_kvm_vatop: 4MB page address not in dump");
goto invalid;
}
*pa = ofs;
@@ -385,9 +385,9 @@ _kvm_vatop_pae(kvm_t *kd, u_long va, off
#define PG_FRAME2M (~PAGE2M_MASK)
pde_pa = ((u_long)pde & PG_FRAME2M) + (va & PAGE2M_MASK);
s = _kvm_pa2off(kd, pde_pa, &ofs);
- if (s < sizeof pde) {
- _kvm_syserr(kd, kd->program,
- "_kvm_vatop_pae: pde_pa not found");
+ if (s == 0) {
+ _kvm_err(kd, kd->program,
+ "_kvm_vatop: 2MB page address not in dump");
goto invalid;
}
*pa = ofs;
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
