Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

crypto: arm64/sm3 - fix possible crash with CFI enabled

sm3_neon_transform() is called via indirect function calls. Therefore
it needs to use SYM_TYPED_FUNC_START instead of SYM_FUNC_START to cause
its type hash to be emitted when the kernel is built with
CONFIG_CFI_CLANG=y. Otherwise, the code crashes with a CFI failure (if
the compiler didn't happen to optimize out the indirect call).

Fixes: c50d32859e70 ("arm64: Add types to indirect called assembly functions")
Acked-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Reviewed-by: Sami Tolvanen <samitolvanen@google.com>
Signed-off-by: Eric Biggers <ebiggers@google.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

authored by

Eric Biggers and committed by
Herbert Xu
be8f6b64 e5e1c67e

+2 -1
+2 -1
arch/arm64/crypto/sm3-neon-core.S
··· 9 9 */ 10 10 11 11 #include <linux/linkage.h> 12 + #include <linux/cfi_types.h> 12 13 #include <asm/assembler.h> 13 14 14 15 /* Context structure */ ··· 352 351 */ 353 352 .text 354 353 .align 3 355 - SYM_FUNC_START(sm3_neon_transform) 354 + SYM_TYPED_FUNC_START(sm3_neon_transform) 356 355 ldp ra, rb, [RSTATE, #0] 357 356 ldp rc, rd, [RSTATE, #8] 358 357 ldp re, rf, [RSTATE, #16]