iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

x86/xen: Add UNTRAIN_RET

Browse Source 
Ensure the Xen entry also passes through UNTRAIN_RET.

Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Signed-off-by: Borislav Petkov <bp@suse.de>
Reviewed-by: Josh Poimboeuf <jpoimboe@kernel.org>
Signed-off-by: Borislav Petkov <bp@suse.de>
This commit is contained in:
Peter Zijlstra 2022-06-14 23:16:01 +02:00 committed by Borislav Petkov
parent b75b7f8ef1
commit d147553b64
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -328,6 +328,12 @@ SYM_CODE_END(ret_from_fork)
#endif #endif
.endm .endm
SYM_CODE_START_LOCAL(xen_error_entry)
UNWIND_HINT_FUNC
UNTRAIN_RET
RET
SYM_CODE_END(xen_error_entry)
/** /**
* idtentry_body - Macro to emit code calling the C function * idtentry_body - Macro to emit code calling the C function
* @cfunc: C function to be called * @cfunc: C function to be called
@ -347,7 +353,7 @@ SYM_CODE_END(ret_from_fork)
* switch the CR3. So it can skip invoking error_entry(). * switch the CR3. So it can skip invoking error_entry().
*/ */
ALTERNATIVE "call error_entry; movq %rax, %rsp", \ ALTERNATIVE "call error_entry; movq %rax, %rsp", \
"", X86_FEATURE_XENPV "call xen_error_entry", X86_FEATURE_XENPV
ENCODE_FRAME_POINTER ENCODE_FRAME_POINTER
UNWIND_HINT_REGS UNWIND_HINT_REGS