|
@@ -645,24 +645,23 @@ void __kprobes do_page_fault(struct pt_regs *regs, unsigned long error_code)
|
|
|
}
|
|
|
|
|
|
|
|
|
-#ifdef CONFIG_X86_32
|
|
|
- /* It's safe to allow irq's after cr2 has been saved and the vmalloc
|
|
|
- fault has been handled. */
|
|
|
- if (regs->flags & (X86_EFLAGS_IF | X86_VM_MASK))
|
|
|
- local_irq_enable();
|
|
|
-
|
|
|
/*
|
|
|
- * If we're in an interrupt, have no user context or are running in an
|
|
|
- * atomic region then we must not take the fault.
|
|
|
+ * It's safe to allow irq's after cr2 has been saved and the
|
|
|
+ * vmalloc fault has been handled.
|
|
|
+ *
|
|
|
+ * User-mode registers count as a user access even for any
|
|
|
+ * potential system fault or CPU buglet.
|
|
|
*/
|
|
|
- if (in_atomic() || !mm)
|
|
|
- goto bad_area_nosemaphore;
|
|
|
-#else /* CONFIG_X86_64 */
|
|
|
- if (likely(regs->flags & X86_EFLAGS_IF))
|
|
|
+ if (user_mode_vm(regs)) {
|
|
|
+ local_irq_enable();
|
|
|
+ error_code |= PF_USER;
|
|
|
+ } else if (regs->flags & X86_EFLAGS_IF)
|
|
|
local_irq_enable();
|
|
|
|
|
|
+#ifdef CONFIG_X86_64
|
|
|
if (unlikely(error_code & PF_RSVD))
|
|
|
pgtable_bad(address, regs, error_code);
|
|
|
+#endif
|
|
|
|
|
|
/*
|
|
|
* If we're in an interrupt, have no user context or are running in an
|
|
@@ -671,14 +670,7 @@ void __kprobes do_page_fault(struct pt_regs *regs, unsigned long error_code)
|
|
|
if (unlikely(in_atomic() || !mm))
|
|
|
goto bad_area_nosemaphore;
|
|
|
|
|
|
- /*
|
|
|
- * User-mode registers count as a user access even for any
|
|
|
- * potential system fault or CPU buglet.
|
|
|
- */
|
|
|
- if (user_mode_vm(regs))
|
|
|
- error_code |= PF_USER;
|
|
|
again:
|
|
|
-#endif
|
|
|
/* When running in the kernel we expect faults to occur only to
|
|
|
* addresses in user space. All other faults represent errors in the
|
|
|
* kernel and should generate an OOPS. Unfortunately, in the case of an
|