diff options
| -rw-r--r-- | arch/x86/entry/entry_64_compat.S | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/x86/entry/entry_64_compat.S b/arch/x86/entry/entry_64_compat.S index 5a1844765a7a..a7e257d9cb90 100644 --- a/arch/x86/entry/entry_64_compat.S +++ b/arch/x86/entry/entry_64_compat.S | |||
| @@ -140,6 +140,7 @@ sysexit_from_sys_call: | |||
| 140 | */ | 140 | */ |
| 141 | andl $~TS_COMPAT, ASM_THREAD_INFO(TI_status, %rsp, SIZEOF_PTREGS) | 141 | andl $~TS_COMPAT, ASM_THREAD_INFO(TI_status, %rsp, SIZEOF_PTREGS) |
| 142 | movl RIP(%rsp), %ecx /* User %eip */ | 142 | movl RIP(%rsp), %ecx /* User %eip */ |
| 143 | movq RAX(%rsp), %rax | ||
| 143 | RESTORE_RSI_RDI | 144 | RESTORE_RSI_RDI |
| 144 | xorl %edx, %edx /* Do not leak kernel information */ | 145 | xorl %edx, %edx /* Do not leak kernel information */ |
| 145 | xorq %r8, %r8 | 146 | xorq %r8, %r8 |
| @@ -219,7 +220,6 @@ sysexit_from_sys_call: | |||
| 219 | 1: setbe %al /* 1 if error, 0 if not */ | 220 | 1: setbe %al /* 1 if error, 0 if not */ |
| 220 | movzbl %al, %edi /* zero-extend that into %edi */ | 221 | movzbl %al, %edi /* zero-extend that into %edi */ |
| 221 | call __audit_syscall_exit | 222 | call __audit_syscall_exit |
| 222 | movq RAX(%rsp), %rax /* reload syscall return value */ | ||
| 223 | movl $(_TIF_ALLWORK_MASK & ~_TIF_SYSCALL_AUDIT), %edi | 223 | movl $(_TIF_ALLWORK_MASK & ~_TIF_SYSCALL_AUDIT), %edi |
| 224 | DISABLE_INTERRUPTS(CLBR_NONE) | 224 | DISABLE_INTERRUPTS(CLBR_NONE) |
| 225 | TRACE_IRQS_OFF | 225 | TRACE_IRQS_OFF |
| @@ -368,6 +368,7 @@ sysretl_from_sys_call: | |||
| 368 | RESTORE_RSI_RDI_RDX | 368 | RESTORE_RSI_RDI_RDX |
| 369 | movl RIP(%rsp), %ecx | 369 | movl RIP(%rsp), %ecx |
| 370 | movl EFLAGS(%rsp), %r11d | 370 | movl EFLAGS(%rsp), %r11d |
| 371 | movq RAX(%rsp), %rax | ||
| 371 | xorq %r10, %r10 | 372 | xorq %r10, %r10 |
| 372 | xorq %r9, %r9 | 373 | xorq %r9, %r9 |
| 373 | xorq %r8, %r8 | 374 | xorq %r8, %r8 |
