|
@@ -840,6 +840,15 @@ show_signal_msg(struct pt_regs *regs, unsigned long error_code,
|
|
|
show_opcodes(regs, loglvl);
|
|
|
}
|
|
|
|
|
|
+/*
|
|
|
+ * The (legacy) vsyscall page is the long page in the kernel portion
|
|
|
+ * of the address space that has user-accessible permissions.
|
|
|
+ */
|
|
|
+static bool is_vsyscall_vaddr(unsigned long vaddr)
|
|
|
+{
|
|
|
+ return (vaddr & PAGE_MASK) == VSYSCALL_ADDR;
|
|
|
+}
|
|
|
+
|
|
|
static void
|
|
|
__bad_area_nosemaphore(struct pt_regs *regs, unsigned long error_code,
|
|
|
unsigned long address, u32 *pkey, int si_code)
|
|
@@ -869,7 +878,7 @@ __bad_area_nosemaphore(struct pt_regs *regs, unsigned long error_code,
|
|
|
* emulation.
|
|
|
*/
|
|
|
if (unlikely((error_code & X86_PF_INSTR) &&
|
|
|
- ((address & ~0xfff) == VSYSCALL_ADDR))) {
|
|
|
+ is_vsyscall_vaddr(address))) {
|
|
|
if (emulate_vsyscall(regs, address))
|
|
|
return;
|
|
|
}
|