Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

kernel: Apply user iframe determination logic to SMAP/SMEP.

Browse Source 
Change-Id: I394492a289f01303ac28e6d6670fbfdb326fa4db
Reviewed-on: https://review.haiku-os.org/561
Reviewed-by: Axel Dörfler <axeld@pinc-software.de>
This commit is contained in:
Michael Lotz 2018-09-13 22:55:05 +02:00 committed by Axel Dörfler
parent 8c005190c4
commit 99888f6b69
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/system/kernel/arch/x86/arch_int.cpp
View File

@ -327,7 +327,7 @@ x86_page_fault_exception(struct iframe* frame)
panic("page fault not allowed at this place. Touching address "
"%p from ip %p\n", (void*)cr2, (void*)frame->ip);
return;
} else if ((frame->error_code & PGFAULT_U) == 0
} else if (!IFRAME_IS_USER(frame)
&& (frame->error_code & PGFAULT_I) != 0
&& (x86_read_cr4() & IA32_CR4_SMEP) != 0) {
// check that: 1. come not from userland,
@ -335,7 +335,7 @@ x86_page_fault_exception(struct iframe* frame)
panic("SMEP violation user-mapped address %p touched from kernel %p\n",
(void*)cr2, (void*)frame->ip);
} else if ((frame->flags & X86_EFLAGS_ALIGNMENT_CHECK) == 0
&& (frame->error_code & PGFAULT_U) == 0
&& !IFRAME_IS_USER(frame)
&& (frame->error_code & PGFAULT_P) != 0
&& (x86_read_cr4() & IA32_CR4_SMAP) != 0) {
// check that: 1. AC flag is not set, 2. come not from userland,