diff options
| author | Renato Botelho <renato@netgate.com> | 2017-01-09 12:11:05 -0200 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2017-01-09 12:11:05 -0200 |
| commit | 681a482d8fc4bfc14a24f7a9d75cca6337f2a520 (patch) | |
| tree | 08368e0c4dcea4baa16f4a34b2cc104c42e1ed27 /sys/i386 | |
| parent | cbeab2a9b6b7ac70992175202f35fcc05a5821d5 (diff) | |
| parent | 91f6edbb8913d163d5c16fb615e84baf8a16d390 (diff) | |
| download | FreeBSD-src-681a482d8fc4bfc14a24f7a9d75cca6337f2a520.zip FreeBSD-src-681a482d8fc4bfc14a24f7a9d75cca6337f2a520.tar.gz | |
Merge remote-tracking branch 'origin/stable/10' into devel
Diffstat (limited to 'sys/i386')
| -rw-r--r-- | sys/i386/i386/trap.c | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/sys/i386/i386/trap.c b/sys/i386/i386/trap.c index a186ff5..f4b7242 100644 --- a/sys/i386/i386/trap.c +++ b/sys/i386/i386/trap.c @@ -879,6 +879,14 @@ trap_pfault(frame, usermode, eva) } /* + * If the trap was caused by errant bits in the PTE then panic. + */ + if (frame->tf_err & PGEX_RSV) { + trap_fatal(frame, eva); + return (-1); + } + + /* * PGEX_I is defined only if the execute disable bit capability is * supported and enabled. */ @@ -968,9 +976,15 @@ trap_fatal(frame, eva) #endif if (type == T_PAGEFLT) { printf("fault virtual address = 0x%x\n", eva); - printf("fault code = %s %s, %s\n", + printf("fault code = %s %s%s, %s\n", code & PGEX_U ? "user" : "supervisor", code & PGEX_W ? "write" : "read", +#if defined(PAE) || defined(PAE_TABLES) + pg_nx != 0 ? + (code & PGEX_I ? " instruction" : " data") : +#endif + "", + code & PGEX_RSV ? "reserved bits in PTE" : code & PGEX_P ? "protection violation" : "page not present"); } printf("instruction pointer = 0x%x:0x%x\n", |
