Commit be8f6b64 authored by Eric Biggers's avatar Eric Biggers Committed by Herbert Xu

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: c50d3285 ("arm64: Add types to indirect called assembly functions")
Acked-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Reviewed-by: default avatarSami Tolvanen <samitolvanen@google.com>
Signed-off-by: default avatarEric Biggers <ebiggers@google.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent e5e1c67e
...@@ -9,6 +9,7 @@ ...@@ -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 @@ ...@@ -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]
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment