diff options
| author | kib <kib@FreeBSD.org> | 2013-09-16 19:58:37 +0000 |
|---|---|---|
| committer | kib <kib@FreeBSD.org> | 2013-09-16 19:58:37 +0000 |
| commit | d1fc4ed2e1ca48c84a00ae57edca41b5eb2553b9 (patch) | |
| tree | a4dbb806708b2f634bb5b21ead32b221e4de33db /sys/i386 | |
| parent | 2b65ca59ac4a003be90a7300cd5acd1c557084a9 (diff) | |
| download | FreeBSD-src-d1fc4ed2e1ca48c84a00ae57edca41b5eb2553b9.zip FreeBSD-src-d1fc4ed2e1ca48c84a00ae57edca41b5eb2553b9.tar.gz | |
Merge the change r255607 from amd64 to i386.
Reviewed by: alc
Sponsored by: The FreeBSD Foundation
MFC after: 1 week
Approved by: re (gjb)
Diffstat (limited to 'sys/i386')
| -rw-r--r-- | sys/i386/i386/pmap.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sys/i386/i386/pmap.c b/sys/i386/i386/pmap.c index a3b93a7..c9f327c 100644 --- a/sys/i386/i386/pmap.c +++ b/sys/i386/i386/pmap.c @@ -4062,6 +4062,8 @@ pmap_copy(pmap_t dst_pmap, pmap_t src_pmap, vm_offset_t dst_addr, vm_size_t len, continue; if (srcptepaddr & PG_PS) { + if ((addr & PDRMASK) != 0 || addr + NBPDR > end_addr) + continue; if (dst_pmap->pm_pdir[ptepindex] == 0 && ((srcptepaddr & PG_MANAGED) == 0 || pmap_pv_insert_pde(dst_pmap, addr, srcptepaddr & |
