Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

x86/xen/64: Fix the reported SS and CS in SYSCALL

When I cleaned up the Xen SYSCALL entries, I inadvertently changed
the reported segment registers. Before my patch, regs->ss was
__USER(32)_DS and regs->cs was __USER(32)_CS. After the patch, they
are FLAT_USER_CS/DS(32).

This had a couple unfortunate effects. It confused the
opportunistic fast return logic. It also significantly increased
the risk of triggering a nasty glibc bug:

https://sourceware.org/bugzilla/show_bug.cgi?id=21269

Update the Xen entry code to change it back.

Reported-by: Brian Gerst <brgerst@gmail.com>
Signed-off-by: Andy Lutomirski <luto@kernel.org>
Cc: Andrew Cooper <andrew.cooper3@citrix.com>
Cc: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Juergen Gross <jgross@suse.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: xen-devel@lists.xenproject.org
Fixes: 8a9949bc71a7 ("x86/xen/64: Rearrange the SYSCALL entries")
Link: http://lkml.kernel.org/r/daba8351ea2764bb30272296ab9ce08a81bd8264.1502775273.git.luto@kernel.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>

authored by

Andy Lutomirski and committed by
Ingo Molnar
fa2016a8 bf4d1a83

+18
+18
arch/x86/xen/xen-asm_64.S
··· 88 88 ENTRY(xen_syscall_target) 89 89 popq %rcx 90 90 popq %r11 91 + 92 + /* 93 + * Neither Xen nor the kernel really knows what the old SS and 94 + * CS were. The kernel expects __USER_DS and __USER_CS, so 95 + * report those values even though Xen will guess its own values. 96 + */ 97 + movq $__USER_DS, 4*8(%rsp) 98 + movq $__USER_CS, 1*8(%rsp) 99 + 91 100 jmp entry_SYSCALL_64_after_hwframe 92 101 ENDPROC(xen_syscall_target) 93 102 ··· 106 97 ENTRY(xen_syscall32_target) 107 98 popq %rcx 108 99 popq %r11 100 + 101 + /* 102 + * Neither Xen nor the kernel really knows what the old SS and 103 + * CS were. The kernel expects __USER32_DS and __USER32_CS, so 104 + * report those values even though Xen will guess its own values. 105 + */ 106 + movq $__USER32_DS, 4*8(%rsp) 107 + movq $__USER32_CS, 1*8(%rsp) 108 + 109 109 jmp entry_SYSCALL_compat_after_hwframe 110 110 ENDPROC(xen_syscall32_target) 111 111