diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2008-08-31 00:43:16 +0000 |
|---|---|---|
| committer | Thomas Schwinge <tschwinge@gnu.org> | 2009-06-18 00:27:19 +0200 |
| commit | 9aa129a1685ce235f75e2306fecf9a8ca09453f1 (patch) | |
| tree | 6194297c202e7c40652af808aa157fc6d36c9c92 | |
| parent | 5a97027c99163974a16614363dafc18a63b990e0 (diff) | |
2008-08-31 Samuel Thibault <samuel.thibault@ens-lyon.org>
* i386/i386/trap.c (user_trap): On page fault, raise exception instead
of asserting that cr2 is below LINEAR_MIN_KERNEL_ADDRESS.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | i386/i386/trap.c | 3 |
2 files changed, 7 insertions, 1 deletions
@@ -1,3 +1,8 @@ +2008-08-31 Samuel Thibault <samuel.thibault@ens-lyon.org> + + * 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 <zhengda1936@gmail.com> Manuel Menal <mmenal@hurdfr.org> 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) |