linuxtorvalds / rpms / kernel

Forked from rpms/kernel 2 years ago
Clone
ba4f69
diff -up linux-3.10.0-327.sdl7.x86_64/arch/x86/include/asm/ptrace.h.addmissing linux-3.10.0-327.sdl7.x86_64/arch/x86/include/asm/ptrace.h
ba4f69
--- linux-3.10.0-327.sdl7.x86_64/arch/x86/include/asm/ptrace.h.addmissing	2015-10-29 16:56:51.000000000 -0400
ba4f69
+++ linux-3.10.0-327.sdl7.x86_64/arch/x86/include/asm/ptrace.h	2015-11-21 23:33:16.430036291 -0500
ba4f69
@@ -109,6 +109,23 @@ static inline int user_mode_vm(struct pt
ba4f69
 #endif
ba4f69
 }
ba4f69
 
ba4f69
+/*
ba4f69
+ * This is the fastest way to check whether regs come from user space.
ba4f69
+ * It is unsafe if regs might come from vm86 mode, though -- in vm86
ba4f69
+ * mode, all bits of CS and SS are completely under the user's control.
ba4f69
+ * The CPU considers vm86 mode to be CPL 3 regardless of CS and SS.
ba4f69
+ *
ba4f69
+ * Do NOT use this function unless you have already ruled out the
ba4f69
+ * possibility that regs came from vm86 mode.
ba4f69
+ *
ba4f69
+ * We check for RPL != 0 instead of RPL == 3 because we don't use rings
ba4f69
+ * 1 or 2 and this is more efficient.
ba4f69
+ */
ba4f69
+static inline int user_mode_ignore_vm86(struct pt_regs *regs)
ba4f69
+{
ba4f69
+	return (regs->cs & SEGMENT_RPL_MASK) != 0;
ba4f69
+}
ba4f69
+
ba4f69
 static inline int v8086_mode(struct pt_regs *regs)
ba4f69
 {
ba4f69
 #ifdef CONFIG_X86_32