lkml.org 
[lkml]   [2018]   [Feb]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Subject[PATCH v3 3/3] x86/entry: Clear registers for compat syscalls
    From
    Date
    From: Andi Kleen <ak@linux.intel.com>

    At entry userspace may have populated registers with values that could
    be useful in a speculative execution attack. Clear them to minimize the
    kernel's attack surface.

    [djbw: interleave the clearing with setting up the stack ]
    Cc: Thomas Gleixner <tglx@linutronix.de>
    Cc: Ingo Molnar <mingo@redhat.com>
    Cc: "H. Peter Anvin" <hpa@zytor.com>
    Cc: x86@kernel.org
    Cc: Andy Lutomirski <luto@kernel.org>
    Signed-off-by: Andi Kleen <ak@linux.intel.com>
    Signed-off-by: Dan Williams <dan.j.williams@intel.com>
    ---
    arch/x86/entry/entry_64_compat.S | 30 ++++++++++++++++++++++++++++++
    1 file changed, 30 insertions(+)

    diff --git a/arch/x86/entry/entry_64_compat.S b/arch/x86/entry/entry_64_compat.S
    index 98d5358e4041..fd65e016e413 100644
    --- a/arch/x86/entry/entry_64_compat.S
    +++ b/arch/x86/entry/entry_64_compat.S
    @@ -85,15 +85,25 @@ ENTRY(entry_SYSENTER_compat)
    pushq %rcx /* pt_regs->cx */
    pushq $-ENOSYS /* pt_regs->ax */
    pushq $0 /* pt_regs->r8 = 0 */
    + xorq %r8, %r8 /* nospec r8 */
    pushq $0 /* pt_regs->r9 = 0 */
    + xorq %r9, %r9 /* nospec r9 */
    pushq $0 /* pt_regs->r10 = 0 */
    + xorq %r10, %r10 /* nospec r10 */
    pushq $0 /* pt_regs->r11 = 0 */
    + xorq %r11, %r11 /* nospec r11 */
    pushq %rbx /* pt_regs->rbx */
    + xorl %ebx, %ebx /* nospec rbx */
    pushq %rbp /* pt_regs->rbp (will be overwritten) */
    + xorl %ebp, %ebp /* nospec rbp */
    pushq $0 /* pt_regs->r12 = 0 */
    + xorq %r12, %r12 /* nospec r12 */
    pushq $0 /* pt_regs->r13 = 0 */
    + xorq %r13, %r13 /* nospec r13 */
    pushq $0 /* pt_regs->r14 = 0 */
    + xorq %r14, %r14 /* nospec r14 */
    pushq $0 /* pt_regs->r15 = 0 */
    + xorq %r15, %r15 /* nospec r15 */
    cld

    /*
    @@ -214,15 +224,25 @@ GLOBAL(entry_SYSCALL_compat_after_hwframe)
    pushq %rbp /* pt_regs->cx (stashed in bp) */
    pushq $-ENOSYS /* pt_regs->ax */
    pushq $0 /* pt_regs->r8 = 0 */
    + xorq %r8, %r8 /* nospec r8 */
    pushq $0 /* pt_regs->r9 = 0 */
    + xorq %r9, %r9 /* nospec r9 */
    pushq $0 /* pt_regs->r10 = 0 */
    + xorq %r10, %r10 /* nospec r10 */
    pushq $0 /* pt_regs->r11 = 0 */
    + xorq %r11, %r11 /* nospec r11 */
    pushq %rbx /* pt_regs->rbx */
    + xorl %ebx, %ebx /* nospec rbx */
    pushq %rbp /* pt_regs->rbp (will be overwritten) */
    + xorl %ebp, %ebp /* nospec rbp */
    pushq $0 /* pt_regs->r12 = 0 */
    + xorq %r12, %r12 /* nospec r12 */
    pushq $0 /* pt_regs->r13 = 0 */
    + xorq %r13, %r13 /* nospec r13 */
    pushq $0 /* pt_regs->r14 = 0 */
    + xorq %r14, %r14 /* nospec r14 */
    pushq $0 /* pt_regs->r15 = 0 */
    + xorq %r15, %r15 /* nospec r15 */

    /*
    * User mode is traced as though IRQs are on, and SYSENTER
    @@ -338,15 +358,25 @@ ENTRY(entry_INT80_compat)
    pushq %rcx /* pt_regs->cx */
    pushq $-ENOSYS /* pt_regs->ax */
    pushq $0 /* pt_regs->r8 = 0 */
    + xorq %r8, %r8 /* nospec r8 */
    pushq $0 /* pt_regs->r9 = 0 */
    + xorq %r9, %r9 /* nospec r9 */
    pushq $0 /* pt_regs->r10 = 0 */
    + xorq %r10, %r10 /* nospec r10 */
    pushq $0 /* pt_regs->r11 = 0 */
    + xorq %r11, %r11 /* nospec r11 */
    pushq %rbx /* pt_regs->rbx */
    + xorl %ebx, %ebx /* nospec rbx */
    pushq %rbp /* pt_regs->rbp */
    + xorl %ebp, %ebp /* nospec rbp */
    pushq %r12 /* pt_regs->r12 */
    + xorq %r12, %r12 /* nospec r12 */
    pushq %r13 /* pt_regs->r13 */
    + xorq %r13, %r13 /* nospec r13 */
    pushq %r14 /* pt_regs->r14 */
    + xorq %r14, %r14 /* nospec r14 */
    pushq %r15 /* pt_regs->r15 */
    + xorq %r15, %r15 /* nospec r15 */
    cld

    /*
    \
     
     \ /
      Last update: 2018-02-06 02:28    [W:2.207 / U:0.000 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site