github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-06 21:45:45 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

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

Browse Source 
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: c50d32859e ("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>
This commit is contained in:
Eric Biggers 2022-11-18 11:44:19 -08:00 committed by Herbert Xu
parent e5e1c67e2f
commit be8f6b6496
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
arch/arm64/crypto/sm3-neon-core.S
View File

@ -9,6 +9,7 @@
*/ */
#include <linux/linkage.h> #include <linux/linkage.h>
#include <linux/cfi_types.h>
#include <asm/assembler.h> #include <asm/assembler.h>
/* Context structure */ /* Context structure */
@ -351,7 +352,7 @@
*/ */
.text .text
.align 3 .align 3
SYM_FUNC_START(sm3_neon_transform) SYM_TYPED_FUNC_START(sm3_neon_transform)
ldp ra, rb, [RSTATE, #0] ldp ra, rb, [RSTATE, #0]
ldp rc, rd, [RSTATE, #8] ldp rc, rd, [RSTATE, #8]
ldp re, rf, [RSTATE, #16] ldp re, rf, [RSTATE, #16]