Re: [RFC PATCH v2 18/27] x86/cet/shstk: Introduce WRUSS instruction
From: Dave Hansen <dave.hansen@linux.intel.com>
Date: 2018-07-13 12:12:34
Also in:
linux-api, linux-arch, linux-mm, lkml
On 07/10/2018 03:26 PM, Yu-cheng Yu wrote:
quoted hunk ↗ jump to hunk
+static int is_wruss(struct pt_regs *regs, unsigned long error_code) +{ + return (((error_code & (X86_PF_USER | X86_PF_SHSTK)) == + (X86_PF_USER | X86_PF_SHSTK)) && !user_mode(regs)); +} + static void show_fault_oops(struct pt_regs *regs, unsigned long error_code, unsigned long address)@@ -848,7 +859,7 @@ __bad_area_nosemaphore(struct pt_regs *regs, unsigned long error_code, struct task_struct *tsk = current; /* User mode accesses just cause a SIGSEGV */ - if (error_code & X86_PF_USER) { + if ((error_code & X86_PF_USER) && !is_wruss(regs, error_code)) { /* * It's possible to have interrupts off here: */
Please don't do it this way.
We have two styles of page fault:
1. User page faults: find a VMA, try to handle (allocate memory et al.),
kill process if we can't handle.
2. Kernel page faults: search for a *discrete* set of conditions that
can be handled, including faults in instructions marked in exception
tables.
X86_PF_USER *means*: do user page fault handling. In the places where
the hardware doesn't set it, but we still want user page fault handling,
we manually set it, like this where we "downgrade" an implicit
supervisor access to a user access:
if (user_mode(regs)) {
local_irq_enable();
error_code |= X86_PF_USER;
flags |= FAULT_FLAG_USER;
So, just please *clear* X86_PF_USER if !user_mode(regs) and X86_PF_SS.
We do not want user page fault handling, thus we should not keep the bit
set.
--
To unsubscribe from this list: send the line "unsubscribe linux-doc" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html