kevin/linux
1
Fork 0
Code

riscv: Add types to indirectly called assembly functions

Browse Source 
With CONFIG_CFI_CLANG, assembly functions indirectly called
from C code must be annotated with type identifiers to pass CFI
checking. Use the SYM_TYPED_START macro to add types to the
relevant functions.

Reviewed-by: Kees Cook <keescook@chromium.org>
Tested-by: Nathan Chancellor <nathan@kernel.org>
Signed-off-by: Sami Tolvanen <samitolvanen@google.com>
Link: https://lore.kernel.org/r/20230710183544.999540-10-samitolvanen@google.com
Signed-off-by: Palmer Dabbelt <palmer@rivosinc.com>
This commit is contained in:
Sami Tolvanen 2023-07-10 18:35:47 +00:00 committed by Palmer Dabbelt
parent 08d0ce30e0
commit 5f59c6855b
No known key found for this signature in database
GPG Key ID: 2E1319F35FBB1889
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
arch/riscv/kernel/mcount.S
View File

@ -3,6 +3,7 @@
#include <linux/init.h> #include <linux/init.h>
#include <linux/linkage.h> #include <linux/linkage.h>
#include <linux/cfi_types.h>
#include <asm/asm.h> #include <asm/asm.h>
#include <asm/csr.h> #include <asm/csr.h>
#include <asm/unistd.h> #include <asm/unistd.h>
@ -47,13 +48,13 @@
addi sp, sp, 4*SZREG addi sp, sp, 4*SZREG
.endm .endm
ENTRY(ftrace_stub) SYM_TYPED_FUNC_START(ftrace_stub)
#ifdef CONFIG_DYNAMIC_FTRACE #ifdef CONFIG_DYNAMIC_FTRACE
.global MCOUNT_NAME .global MCOUNT_NAME
.set MCOUNT_NAME, ftrace_stub .set MCOUNT_NAME, ftrace_stub
#endif #endif
ret ret
ENDPROC(ftrace_stub) SYM_FUNC_END(ftrace_stub)
#ifdef CONFIG_FUNCTION_GRAPH_TRACER #ifdef CONFIG_FUNCTION_GRAPH_TRACER
ENTRY(return_to_handler) ENTRY(return_to_handler)

5
arch/riscv/kernel/suspend_entry.S
View File

@ -5,6 +5,7 @@
*/ */
#include <linux/linkage.h> #include <linux/linkage.h>
#include <linux/cfi_types.h>
#include <asm/asm.h> #include <asm/asm.h>
#include <asm/asm-offsets.h> #include <asm/asm-offsets.h>
#include <asm/assembler.h> #include <asm/assembler.h>
@ -58,7 +59,7 @@ ENTRY(__cpu_suspend_enter)
ret ret
END(__cpu_suspend_enter) END(__cpu_suspend_enter)
ENTRY(__cpu_resume_enter) SYM_TYPED_FUNC_START(__cpu_resume_enter)
/* Load the global pointer */ /* Load the global pointer */
.option push .option push
.option norelax .option norelax
@ -94,4 +95,4 @@ ENTRY(__cpu_resume_enter)
/* Return to C code */ /* Return to C code */
ret ret
END(__cpu_resume_enter) SYM_FUNC_END(__cpu_resume_enter)