Skip to content

Commit 613871c

Browse files
jpoimboePeter Zijlstra
authored andcommitted
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: ed53a0d ("x86/alternative: Use .ibt_endbr_seal to seal indirect calls") Signed-off-by: Josh Poimboeuf <[email protected]> Signed-off-by: Peter Zijlstra (Intel) <[email protected]> Link: https://lkml.kernel.org/r/1b5b54aad7d81241dabe5e0c9b40dea64b540b00.1650300597.git.jpoimboe@redhat.com
1 parent 4a5de9b commit 613871c

File tree

1 file changed

+1
-0
lines changed

1 file changed

+1
-0
lines changed

arch/x86/include/asm/static_call.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
".align 4 \n" \
2727
".globl " STATIC_CALL_TRAMP_STR(name) " \n" \
2828
STATIC_CALL_TRAMP_STR(name) ": \n" \
29+
ANNOTATE_NOENDBR \
2930
insns " \n" \
3031
".byte 0x53, 0x43, 0x54 \n" \
3132
".type " STATIC_CALL_TRAMP_STR(name) ", @function \n" \

0 commit comments

Comments
 (0)