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

Configure Feed

Select the types of activity you want to include in your feed.

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

sm3_transform_avx() 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: ccace936eec7 ("x86: Add types to indirectly 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 8ba490d9 a1d72fa3

+2 -1
+2 -1
arch/x86/crypto/sm3-avx-asm_64.S
··· 12 12 */ 13 13 14 14 #include <linux/linkage.h> 15 + #include <linux/cfi_types.h> 15 16 #include <asm/frame.h> 16 17 17 18 /* Context structure */ ··· 329 328 * const u8 *data, int nblocks); 330 329 */ 331 330 .align 16 332 - SYM_FUNC_START(sm3_transform_avx) 331 + SYM_TYPED_FUNC_START(sm3_transform_avx) 333 332 /* input: 334 333 * %rdi: ctx, CTX 335 334 * %rsi: data (64*nblks bytes)