From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755107AbbCSBf2 (ORCPT ); Wed, 18 Mar 2015 21:35:28 -0400 Received: from mail.kernel.org ([198.145.29.136]:52245 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751765AbbCSBdp (ORCPT ); Wed, 18 Mar 2015 21:33:45 -0400 From: Andy Lutomirski To: x86@kernel.org, linux-kernel@vger.kernel.org Cc: Brad Spengler , Denys Vlasenko , Andy Lutomirski Subject: [PATCH 5/9] x86, traps: Use user_mode_ignore_vm86 where appropriate Date: Wed, 18 Mar 2015 18:33:31 -0700 Message-Id: <0b324d5b75c3402be07f8d3c6245ed7f4995029e.1426728647.git.luto@kernel.org> X-Mailer: git-send-email 2.3.0 In-Reply-To: References: In-Reply-To: References: Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- 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 081252c44cde..376fc1562bd1 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; -- 2.3.0