From 32a2352d479a0e019c8e96dff7ef02402b2da867 Mon Sep 17 00:00:00 2001 From: Jan Beulich Date: Fri, 19 Oct 2007 20:35:03 +0200 Subject: [PATCH] --- yaml --- r: 71695 b: refs/heads/master c: b1992df3f070475b243b12ca1241a5938ef5f9bc h: refs/heads/master i: 71693: ba53c7e83c97998bd830a135c956a2b49e12db1b 71691: 587003ce8a12d2c0b23fc61bd8ae774acff9b492 71687: a9d58fe12b8afc57ae0bc7669a043b38711f1c64 71679: f5fb02189c1c8c5b98f457738ef436ba4b748d48 v: v3 --- [refs] | 2 +- trunk/arch/x86/mm/fault_32.c | 3 ++- trunk/arch/x86/mm/fault_64.c | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 9b4183e4e644..339bb78f4be8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1f503e7743df91eb6f63af27c310c557edfc3307 +refs/heads/master: b1992df3f070475b243b12ca1241a5938ef5f9bc diff --git a/trunk/arch/x86/mm/fault_32.c b/trunk/arch/x86/mm/fault_32.c index 6555c3d14371..c9a03f73986e 100644 --- a/trunk/arch/x86/mm/fault_32.c +++ b/trunk/arch/x86/mm/fault_32.c @@ -564,7 +564,8 @@ fastcall void __kprobes do_page_fault(struct pt_regs *regs, * it's allocated already. */ if ((page >> PAGE_SHIFT) < max_low_pfn - && (page & _PAGE_PRESENT)) { + && (page & _PAGE_PRESENT) + && !(page & _PAGE_PSE)) { page &= PAGE_MASK; page = ((__typeof__(page) *) __va(page))[(address >> PAGE_SHIFT) & (PTRS_PER_PTE - 1)]; diff --git a/trunk/arch/x86/mm/fault_64.c b/trunk/arch/x86/mm/fault_64.c index a881f0796169..1e631745ca41 100644 --- a/trunk/arch/x86/mm/fault_64.c +++ b/trunk/arch/x86/mm/fault_64.c @@ -169,7 +169,7 @@ void dump_pagetable(unsigned long address) pmd = pmd_offset(pud, address); if (bad_address(pmd)) goto bad; printk("PMD %lx ", pmd_val(*pmd)); - if (!pmd_present(*pmd)) goto ret; + if (!pmd_present(*pmd) || pmd_large(*pmd)) goto ret; pte = pte_offset_kernel(pmd, address); if (bad_address(pte)) goto bad;