aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/mm/fault.c
diff options
context:
space:
mode:
authorAndy Lutomirski <luto@kernel.org>2021-02-09 18:33:44 -0800
committerBorislav Petkov <bp@suse.de>2021-02-10 14:45:39 +0100
commit66fcd98883816dba3b66da20b5fc86fa410638b5 (patch)
treec5b78ad2fede708345f04a803daa13222a74fbe1 /arch/x86/mm/fault.c
parentx86/fault: Rename no_context() to kernelmode_fixup_or_oops() (diff)
downloadlinux-dev-66fcd98883816dba3b66da20b5fc86fa410638b5.tar.xz
linux-dev-66fcd98883816dba3b66da20b5fc86fa410638b5.zip
x86/fault: Don't look for extable entries for SMEP violations
If the kernel gets a SMEP violation or a fault that would have been a SMEP violation if it had SMEP support, it shouldn't run fixups. Just OOPS. [ bp: Massage commit message. ] Signed-off-by: Andy Lutomirski <luto@kernel.org> Signed-off-by: Borislav Petkov <bp@suse.de> Link: https://lkml.kernel.org/r/46160d8babce2abf1d6daa052146002efa24ac56.1612924255.git.luto@kernel.org
Diffstat (limited to 'arch/x86/mm/fault.c')
-rw-r--r--arch/x86/mm/fault.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/mm/fault.c b/arch/x86/mm/fault.c
index 3566a594e292..1a0cfede8822 100644
--- a/arch/x86/mm/fault.c
+++ b/arch/x86/mm/fault.c
@@ -1250,12 +1250,12 @@ void do_user_addr_fault(struct pt_regs *regs,
* user memory. Unless this is AMD erratum #93, which
* corrupts RIP such that it looks like a user address,
* this is unrecoverable. Don't even try to look up the
- * VMA.
+ * VMA or look for extable entries.
*/
if (is_errata93(regs, address))
return;
- bad_area_nosemaphore(regs, error_code, address);
+ page_fault_oops(regs, error_code, address);
return;
}