diff options
| author |   Sami Tolvanen <samitolvanen@google.com> | 2021-04-08 11:28:41 -0700 |
|---|---|---|
| committer |   Kees Cook <keescook@chromium.org> | 2021-04-08 16:04:23 -0700 |
| commit | 800618f955a9647d8e03b9a367da974f7eecb120 (patch) | |
| tree | 117f7b9e79b0ad5f40ab6fa6cbc3bd041761a90a | |
| parent | arm64: add __nocfi to __apply_alternatives (diff) | |
| download | linux-dev-800618f955a9647d8e03b9a367da974f7eecb120.tar.xz linux-dev-800618f955a9647d8e03b9a367da974f7eecb120.zip | |
arm64: ftrace: use function_nocfi for ftrace_call
With CONFIG_CFI_CLANG, the compiler replaces function pointers with
jump table addresses, which breaks dynamic ftrace as the address of
ftrace_call is replaced with the address of ftrace_call.cfi_jt. Use
function_nocfi() to get the address of the actual function instead.
Suggested-by: Ben Dai <ben.dai@unisoc.com>
Signed-off-by: Sami Tolvanen <samitolvanen@google.com>
Acked-by: Mark Rutland <mark.rutland@arm.com>
Tested-by: Nathan Chancellor <nathan@kernel.org>
Signed-off-by: Kees Cook <keescook@chromium.org>
Link: https://lore.kernel.org/r/20210408182843.1754385-17-samitolvanen@google.com
| -rw-r--r-- | arch/arm64/kernel/ftrace.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm64/kernel/ftrace.c b/arch/arm64/kernel/ftrace.c index 86a5cf9bc19a..b5d3ddaf69d9 100644 --- a/arch/arm64/kernel/ftrace.c +++ b/arch/arm64/kernel/ftrace.c @@ -55,7 +55,7 @@ int ftrace_update_ftrace_func(ftrace_func_t func) unsigned long pc; u32 new; - pc = (unsigned long)&ftrace_call; + pc = (unsigned long)function_nocfi(ftrace_call); new = aarch64_insn_gen_branch_imm(pc, (unsigned long)func, AARCH64_INSN_BRANCH_LINK); |