Commit 394838c9 authored Mar 09, 2015 by Andy Lutomirski Committed by Ingo Molnar Mar 10, 2015

x86/asm/entry/32: Fix user_mode() misuses

The one in do_debug() is probably harmless, but better safe than sorry.

Signed-off-by: Andy Lutomirski <luto@amacapital.net>
Cc: <stable@vger.kernel.org>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Dave Hansen <dave.hansen@linux.intel.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/d67deaa9df5458363623001f252d1aee3215d014.1425948056.git.luto@amacapital.net

Signed-off-by: Ingo Molnar <mingo@kernel.org>

parent e8932869

arch/x86/kernel/traps.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -384,7 +384,7 @@ dotraplinkage void do_bounds(struct pt_regs *regs, long error_code)
		goto exit;
		conditional_sti(regs);

		if (!user_mode(regs))
		if (!user_mode_vm(regs))
		die("bounds", regs, error_code);

		if (!cpu_feature_enabled(X86_FEATURE_MPX)) {
		@@ -637,7 +637,7 @@ dotraplinkage void do_debug(struct pt_regs *regs, long error_code)
		* then it's very likely the result of an icebp/int01 trap.
		* User wants a sigtrap for that.
		*/
		if (!dr6 && user_mode(regs))
		if (!dr6 && user_mode_vm(regs))
		user_icebp = 1;

		/* Catch kmemcheck conditions first of all! */