lkml.org 
[lkml]   [2015]   [Mar]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[tip:x86/asm] x86/asm/entry: Use user_mode_ignore_vm86() where appropriate
    Commit-ID:  ae60f0710ae6b33092267ef8ac853c498f6d3e5d
    Gitweb: http://git.kernel.org/tip/ae60f0710ae6b33092267ef8ac853c498f6d3e5d
    Author: Andy Lutomirski <luto@kernel.org>
    AuthorDate: Wed, 18 Mar 2015 18:33:31 -0700
    Committer: Ingo Molnar <mingo@kernel.org>
    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 <luto@kernel.org>
    Cc: Borislav Petkov <bp@alien8.de>
    Cc: Brad Spengler <spender@grsecurity.net>
    Cc: Denys Vlasenko <dvlasenk@redhat.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/0b324d5b75c3402be07f8d3c6245ed7f4995029e.1426728647.git.luto@kernel.org
    Signed-off-by: Ingo Molnar <mingo@kernel.org>
    ---
    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;

    \
     
     \ /
      Last update: 2015-03-23 13:41    [W:4.221 / U:0.012 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site