From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751778AbbCJKIR (ORCPT ); Tue, 10 Mar 2015 06:08:17 -0400 Received: from terminus.zytor.com ([198.137.202.10]:48103 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751188AbbCJKIO (ORCPT ); Tue, 10 Mar 2015 06:08:14 -0400 Date: Tue, 10 Mar 2015 03:07:28 -0700 From: tip-bot for Andy Lutomirski Message-ID: Cc: tglx@linutronix.de, luto@amacapital.net, mingo@kernel.org, hpa@zytor.com, linux-kernel@vger.kernel.org, dave.hansen@linux.intel.com, bp@alien8.de, torvalds@linux-foundation.org, stable@vger.kernel.org Reply-To: stable@vger.kernel.org, torvalds@linux-foundation.org, bp@alien8.de, dave.hansen@linux.intel.com, linux-kernel@vger.kernel.org, hpa@zytor.com, mingo@kernel.org, luto@amacapital.net, tglx@linutronix.de In-Reply-To: References: To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/urgent] x86/asm/entry/32: Fix user_mode() misuses Git-Commit-ID: 394838c96013ba414a24ffe7a2a593a9154daadf X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 394838c96013ba414a24ffe7a2a593a9154daadf Gitweb: http://git.kernel.org/tip/394838c96013ba414a24ffe7a2a593a9154daadf Author: Andy Lutomirski AuthorDate: Mon, 9 Mar 2015 17:42:31 -0700 Committer: Ingo Molnar 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 Cc: Cc: Borislav Petkov Cc: Dave Hansen Cc: H. Peter Anvin Cc: Linus Torvalds Cc: Thomas Gleixner Link: http://lkml.kernel.org/r/d67deaa9df5458363623001f252d1aee3215d014.1425948056.git.luto@amacapital.net Signed-off-by: Ingo Molnar --- 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! */