diff options
| author | Josh Poimboeuf <jpoimboe@redhat.com> | 2022-04-18 18:50:23 +0200 |
|---|---|---|
| committer | Peter Zijlstra <peterz@infradead.org> | 2022-04-19 21:58:49 +0200 |
| commit | 1c0513dec41e4d40eb21402dff397ad84ca13a44 (patch) | |
| tree | 114c7f4e8be4f01cd6d8d86a4f0c8d74916e2c0d | |
| parent | x86/static_call: Add ANNOTATE_NOENDBR to static call trampoline (diff) | |
| download | linux-1c0513dec41e4d40eb21402dff397ad84ca13a44.tar.xz linux-1c0513dec41e4d40eb21402dff397ad84ca13a44.zip | |
x86/retpoline: Add ANNOTATE_NOENDBR for retpolines
The retpolines are exported, so they're referenced by ksymtab sections.
But they're never indirect-branched to, so add ANNOTATE_NOENDBR.
Fixes: ed53a0d97192 ("x86/alternative: Use .ibt_endbr_seal to seal indirect calls")
Signed-off-by: Josh Poimboeuf <jpoimboe@redhat.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Link: https://lkml.kernel.org/r/b6ec963dfd9301b6b1d74ef7758fcb0b540d6c6c.1650300597.git.jpoimboe@redhat.com
| -rw-r--r-- | arch/x86/lib/retpoline.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/lib/retpoline.S b/arch/x86/lib/retpoline.S index 5f87bab4fb8d..b2b2366885a2 100644 --- a/arch/x86/lib/retpoline.S +++ b/arch/x86/lib/retpoline.S @@ -31,6 +31,7 @@ .align RETPOLINE_THUNK_SIZE SYM_INNER_LABEL(__x86_indirect_thunk_\reg, SYM_L_GLOBAL) UNWIND_HINT_EMPTY + ANNOTATE_NOENDBR ALTERNATIVE_2 __stringify(ANNOTATE_RETPOLINE_SAFE; jmp *%\reg), \ __stringify(RETPOLINE \reg), X86_FEATURE_RETPOLINE, \ @@ -55,7 +56,6 @@ SYM_INNER_LABEL(__x86_indirect_thunk_\reg, SYM_L_GLOBAL) .align RETPOLINE_THUNK_SIZE SYM_CODE_START(__x86_indirect_thunk_array) - ANNOTATE_NOENDBR // apply_retpolines #define GEN(reg) THUNK reg #include <asm/GEN-for-each-reg.h> |