diff options
| author | Josh Poimboeuf <jpoimboe@redhat.com> | 2022-04-18 09:50:22 -0700 |
|---|---|---|
| committer | Peter Zijlstra <peterz@infradead.org> | 2022-04-19 21:58:48 +0200 |
| commit | 613871cd665ab26290c5ff531dd06c3789d31319 (patch) | |
| tree | dbd70c86f3035242f4433b90e276048b498073df /arch | |
| parent | 4a5de9b76fcb3f477f73d5a63f6e27709e8af81f (diff) | |
| download | linux-stable-613871cd665ab26290c5ff531dd06c3789d31319.tar.gz linux-stable-613871cd665ab26290c5ff531dd06c3789d31319.tar.bz2 linux-stable-613871cd665ab26290c5ff531dd06c3789d31319.zip | |
x86/static_call: Add ANNOTATE_NOENDBR to static call trampoline
The static call trampoline is never indirect-branched to, but is
referenced by the static call key. 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/1b5b54aad7d81241dabe5e0c9b40dea64b540b00.1650300597.git.jpoimboe@redhat.com
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/include/asm/static_call.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/include/asm/static_call.h b/arch/x86/include/asm/static_call.h index 2455d721503e..2d8dacd02643 100644 --- a/arch/x86/include/asm/static_call.h +++ b/arch/x86/include/asm/static_call.h @@ -26,6 +26,7 @@ ".align 4 \n" \ ".globl " STATIC_CALL_TRAMP_STR(name) " \n" \ STATIC_CALL_TRAMP_STR(name) ": \n" \ + ANNOTATE_NOENDBR \ insns " \n" \ ".byte 0x53, 0x43, 0x54 \n" \ ".type " STATIC_CALL_TRAMP_STR(name) ", @function \n" \ |