LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
* [tip:x86/urgent] x86/asm/entry/32: Fix user_mode() misuses
       [not found] <d67deaa9df5458363623001f252d1aee3215d014.1425948056.git.luto@amacapital.net>
@ 2015-03-10 10:07 ` tip-bot for Andy Lutomirski
  0 siblings, 0 replies; only message in thread
From: tip-bot for Andy Lutomirski @ 2015-03-10 10:07 UTC (permalink / raw)
  To: linux-tip-commits
  Cc: tglx, luto, mingo, hpa, linux-kernel, dave.hansen, bp, torvalds, stable

Commit-ID:  394838c96013ba414a24ffe7a2a593a9154daadf
Gitweb:     http://git.kernel.org/tip/394838c96013ba414a24ffe7a2a593a9154daadf
Author:     Andy Lutomirski <luto@amacapital.net>
AuthorDate: Mon, 9 Mar 2015 17:42:31 -0700
Committer:  Ingo Molnar <mingo@kernel.org>
CommitDate: Tue, 10 Mar 2015 04:21:51 +0100

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>
---
 arch/x86/kernel/traps.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/x86/kernel/traps.c b/arch/x86/kernel/traps.c
index 9d2073e..4ff5d16 100644
--- a/arch/x86/kernel/traps.c
+++ b/arch/x86/kernel/traps.c
@@ -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! */

^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2015-03-10 10:08 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
     [not found] <d67deaa9df5458363623001f252d1aee3215d014.1425948056.git.luto@amacapital.net>
2015-03-10 10:07 ` [tip:x86/urgent] x86/asm/entry/32: Fix user_mode() misuses tip-bot for Andy Lutomirski

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).