diff options
| author | Ben Hutchings <ben@decadent.org.uk> | 2022-07-14 01:39:33 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2022-07-25 12:26:52 +0300 |
| commit | 668cb1ddf0ae7fcffcfc2ac1cfec9f770c8191fc (patch) | |
| tree | 18c7afedf0892fdebe9dadab511ea367e8141860 | |
| parent | 81f20e5000eca278a8bab4959c4fa1beda1fbed5 (diff) | |
| download | linux-668cb1ddf0ae7fcffcfc2ac1cfec9f770c8191fc.tar.xz | |
x86/xen: Fix initialisation in hypercall_page after rethunk
The hypercall_page is special and the RETs there should not be changed
into rethunk calls (but can have SLS mitigation). Change the initial
instructions to ret + int3 padding, as was done in upstream commit
5b2fc51576ef "x86/ibt,xen: Sprinkle the ENDBR".
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | arch/x86/xen/xen-head.S | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/xen/xen-head.S b/arch/x86/xen/xen-head.S index 38b73e7e54ba..2a3ef5fcba34 100644 --- a/arch/x86/xen/xen-head.S +++ b/arch/x86/xen/xen-head.S @@ -69,9 +69,9 @@ SYM_CODE_END(asm_cpu_bringup_and_idle) SYM_CODE_START(hypercall_page) .rept (PAGE_SIZE / 32) UNWIND_HINT_FUNC - .skip 31, 0x90 ANNOTATE_UNRET_SAFE - RET + ret + .skip 31, 0xcc .endr #define HYPERCALL(n) \ |