From 9aa129a1685ce235f75e2306fecf9a8ca09453f1 Mon Sep 17 00:00:00 2001 From: Samuel Thibault Date: Sun, 31 Aug 2008 00:43:16 +0000 Subject: 2008-08-31 Samuel Thibault * i386/i386/trap.c (user_trap): On page fault, raise exception instead of asserting that cr2 is below LINEAR_MIN_KERNEL_ADDRESS. --- ChangeLog | 5 +++++ i386/i386/trap.c | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index df8d87d..0eea6c0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2008-08-31 Samuel Thibault + + * i386/i386/trap.c (user_trap): On page fault, raise exception instead + of asserting that cr2 is below LINEAR_MIN_KERNEL_ADDRESS. + 2008-07-29 Zheng Da Manuel Menal diff --git a/i386/i386/trap.c b/i386/i386/trap.c index f14491a..5609131 100644 --- a/i386/i386/trap.c +++ b/i386/i386/trap.c @@ -513,7 +513,8 @@ printf("user trap %d error %d sub %08x\n", type, code, subcode); dump_ss (regs); #endif - assert(subcode < LINEAR_MIN_KERNEL_ADDRESS); + if (subcode >= LINEAR_MIN_KERNEL_ADDRESS) + i386_exception(EXC_BAD_ACCESS, EXC_I386_PGFLT, subcode); (void) vm_fault(thread->task->map, trunc_page((vm_offset_t)subcode), (regs->err & T_PF_WRITE) -- cgit v1.2.3