summaryrefslogtreecommitdiff
path: root/arch/x86/lib/error-inject.c
diff options
context:
space:
mode:
authorPeter Zijlstra <peterz@infradead.org>2022-03-08 18:30:40 +0300
committerPeter Zijlstra <peterz@infradead.org>2022-03-15 12:32:40 +0300
commit3e3f069504344c241f89737e4af014f83fca0b27 (patch)
tree688a7a7c08057f42a4020b1a425ad4f5f528ae36 /arch/x86/lib/error-inject.c
parentfe379fa4d199abc52d5b4a256e52cf94eff685cf (diff)
downloadlinux-3e3f069504344c241f89737e4af014f83fca0b27.tar.xz
x86/ibt: Annotate text references
Annotate away some of the generic code references. This is things where we take the address of a symbol for exception handling or return addresses (eg. context switch). Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org> Acked-by: Josh Poimboeuf <jpoimboe@redhat.com> Link: https://lore.kernel.org/r/20220308154318.877758523@infradead.org
Diffstat (limited to 'arch/x86/lib/error-inject.c')
-rw-r--r--arch/x86/lib/error-inject.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86/lib/error-inject.c b/arch/x86/lib/error-inject.c
index 520897061ee0..1e3de0769b81 100644
--- a/arch/x86/lib/error-inject.c
+++ b/arch/x86/lib/error-inject.c
@@ -3,6 +3,7 @@
#include <linux/linkage.h>
#include <linux/error-injection.h>
#include <linux/kprobes.h>
+#include <linux/objtool.h>
asmlinkage void just_return_func(void);
@@ -11,6 +12,7 @@ asm(
".type just_return_func, @function\n"
".globl just_return_func\n"
"just_return_func:\n"
+ ANNOTATE_NOENDBR
ASM_RET
".size just_return_func, .-just_return_func\n"
);