From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932160AbbCWM1n (ORCPT ); Mon, 23 Mar 2015 08:27:43 -0400 Received: from terminus.zytor.com ([198.137.202.10]:41536 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752185AbbCWM1j (ORCPT ); Mon, 23 Mar 2015 08:27:39 -0400 Date: Mon, 23 Mar 2015 05:27:10 -0700 From: tip-bot for Andy Lutomirski Message-ID: Cc: bp@alien8.de, tglx@linutronix.de, spender@grsecurity.net, luto@kernel.org, dvlasenk@redhat.com, hpa@zytor.com, torvalds@linux-foundation.org, linux-kernel@vger.kernel.org, mingo@kernel.org Reply-To: mingo@kernel.org, linux-kernel@vger.kernel.org, hpa@zytor.com, torvalds@linux-foundation.org, dvlasenk@redhat.com, luto@kernel.org, spender@grsecurity.net, tglx@linutronix.de, bp@alien8.de In-Reply-To: <0b324d5b75c3402be07f8d3c6245ed7f4995029e.1426728647.git.luto@kernel.org> References: <0b324d5b75c3402be07f8d3c6245ed7f4995029e.1426728647.git.luto@kernel.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/asm] x86/asm/entry: Use user_mode_ignore_vm86() where appropriate Git-Commit-ID: ae60f0710ae6b33092267ef8ac853c498f6d3e5d 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: ae60f0710ae6b33092267ef8ac853c498f6d3e5d Gitweb: http://git.kernel.org/tip/ae60f0710ae6b33092267ef8ac853c498f6d3e5d Author: Andy Lutomirski AuthorDate: Wed, 18 Mar 2015 18:33:31 -0700 Committer: Ingo Molnar CommitDate: Mon, 23 Mar 2015 11:13:46 +0100 x86/asm/entry: Use user_mode_ignore_vm86() where appropriate A few of the user_mode() checks in traps.c are immediately after explicit checks for vm86 mode. Change them to user_mode_ignore_vm86(). Signed-off-by: Andy Lutomirski Cc: Borislav Petkov Cc: Brad Spengler Cc: Denys Vlasenko Cc: H. Peter Anvin Cc: Linus Torvalds Cc: Thomas Gleixner Link: http://lkml.kernel.org/r/0b324d5b75c3402be07f8d3c6245ed7f4995029e.1426728647.git.luto@kernel.org Signed-off-by: Ingo Molnar --- arch/x86/kernel/traps.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/x86/kernel/traps.c b/arch/x86/kernel/traps.c index 2773411..1136961 100644 --- a/arch/x86/kernel/traps.c +++ b/arch/x86/kernel/traps.c @@ -208,7 +208,7 @@ do_trap_no_signal(struct task_struct *tsk, int trapnr, char *str, return -1; } #endif - if (!user_mode(regs)) { + if (!user_mode_ignore_vm86(regs)) { if (!fixup_exception(regs)) { tsk->thread.error_code = error_code; tsk->thread.trap_nr = trapnr; @@ -471,7 +471,7 @@ do_general_protection(struct pt_regs *regs, long error_code) #endif tsk = current; - if (!user_mode(regs)) { + if (!user_mode_ignore_vm86(regs)) { if (fixup_exception(regs)) goto exit; @@ -688,7 +688,7 @@ dotraplinkage void do_debug(struct pt_regs *regs, long error_code) * We already checked v86 mode above, so we can check for kernel mode * by just checking the CPL of CS. */ - if ((dr6 & DR_STEP) && !user_mode(regs)) { + if ((dr6 & DR_STEP) && !user_mode_ignore_vm86(regs)) { tsk->thread.debugreg6 &= ~DR_STEP; set_tsk_thread_flag(tsk, TIF_SINGLESTEP); regs->flags &= ~X86_EFLAGS_TF;