p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

x86/entry/32: Fix entry_INT80_32() to expect interrupts to be on 

When I rewrote entry_INT80_32, I thought that int80 was an
interrupt gate.  It's a trap gate.  *facepalm*

Thanks to Brian Gerst for pointing out that it's better to
change the entry code than to change the gate type.

Suggested-by: Brian Gerst <brgerst@gmail.com>
Reported-and-tested-by: Borislav Petkov <bp@suse.de>
Signed-off-by: Andy Lutomirski <luto@kernel.org>
Cc: Andy Lutomirski <luto@amacapital.net>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Denys Vlasenko <dvlasenk@redhat.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Fixes: 150ac78d63 ("x86/entry/32: Switch INT80 to the new C syscall path")
Link: http://lkml.kernel.org/r/dc09d9b574a5c1dcca996847875c73f8341ce0ad.1445035014.git.luto@kernel.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
This commit is contained in:
Andy Lutomirski 2015-10-16 15:42:54 -07:00 committed by Ingo Molnar
parent 612bece654
commit 657c1eea00
3 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
arch/x86/entry/common.c
View File

@ -351,7 +351,14 @@ __visible inline void syscall_return_slowpath(struct pt_regs *regs)
* in workloads that use it, and it's usually called from * in workloads that use it, and it's usually called from
* do_fast_syscall_32, so forcibly inline it to improve performance. * do_fast_syscall_32, so forcibly inline it to improve performance.
*/ */
static __always_inline void do_syscall_32_irqs_on(struct pt_regs *regs) #ifdef CONFIG_X86_32
/* 32-bit kernels use a trap gate for INT80, and the asm code calls here. */
__visible
#else
/* 64-bit kernels use do_syscall_32_irqs_off() instead. */
static
#endif
__always_inline void do_syscall_32_irqs_on(struct pt_regs *regs)
{ {
struct thread_info *ti = pt_regs_to_thread_info(regs); struct thread_info *ti = pt_regs_to_thread_info(regs);
unsigned int nr = (unsigned int)regs->orig_ax; unsigned int nr = (unsigned int)regs->orig_ax;
@ -386,12 +393,14 @@ static __always_inline void do_syscall_32_irqs_on(struct pt_regs *regs)
syscall_return_slowpath(regs); syscall_return_slowpath(regs);
} }
/* Handles int $0x80 */ #ifdef CONFIG_X86_64
__visible void do_int80_syscall_32(struct pt_regs *regs) /* Handles INT80 on 64-bit kernels */
__visible void do_syscall_32_irqs_off(struct pt_regs *regs)
{ {
local_irq_enable(); local_irq_enable();
do_syscall_32_irqs_on(regs); do_syscall_32_irqs_on(regs);
} }
#endif
/* Returns 0 to return using IRET or 1 to return using SYSEXIT/SYSRETL. */ /* Returns 0 to return using IRET or 1 to return using SYSEXIT/SYSRETL. */
__visible long do_fast_syscall_32(struct pt_regs *regs) __visible long do_fast_syscall_32(struct pt_regs *regs)

8
arch/x86/entry/entry_32.S
View File

@ -345,13 +345,13 @@ ENTRY(entry_INT80_32)
SAVE_ALL pt_regs_ax=$-ENOSYS /* save rest */ SAVE_ALL pt_regs_ax=$-ENOSYS /* save rest */
/* /*
* User mode is traced as though IRQs are on, and the interrupt gate * User mode is traced as though IRQs are on. Unlike the 64-bit
* turned them off. * case, INT80 is a trap gate on 32-bit kernels, so interrupts
* are already on (unless user code is messing around with iopl).
*/ */
TRACE_IRQS_OFF
movl %esp, %eax movl %esp, %eax
call do_int80_syscall_32 call do_syscall_32_irqs_on
.Lsyscall_32_done: .Lsyscall_32_done:
restore_all: restore_all:

2
arch/x86/entry/entry_64_compat.S
View File

@ -303,7 +303,7 @@ ENTRY(entry_INT80_compat)
TRACE_IRQS_OFF TRACE_IRQS_OFF
movq %rsp, %rdi movq %rsp, %rdi
call do_int80_syscall_32 call do_syscall_32_irqs_off
.Lsyscall_32_done: .Lsyscall_32_done:
/* Go back to user mode. */ /* Go back to user mode. */