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

crypto: arm64/aes-neonbs - fix crash with CFI enabled

aesbs_ecb_encrypt(), aesbs_ecb_decrypt(), aesbs_xts_encrypt(), and
aesbs_xts_decrypt() are called via indirect function calls. Therefore
they need to use SYM_TYPED_FUNC_START instead of SYM_FUNC_START to cause
their type hashes to be emitted when the kernel is built with
CONFIG_CFI_CLANG=y. Otherwise, the code crashes with a CFI failure if
the compiler doesn't happen to optimize out the indirect calls.

Fixes: c50d32859e70 ("arm64: Add types to indirect called assembly functions")
Cc: stable@vger.kernel.org
Signed-off-by: Eric Biggers <ebiggers@google.com>
Reviewed-by: Ard Biesheuvel <ardb@kernel.org>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

authored by

Eric Biggers and committed by
Herbert Xu
47446d7c a1862c3b

+5 -4
+5 -4
arch/arm64/crypto/aes-neonbs-core.S
··· 15 15 */ 16 16 17 17 #include <linux/linkage.h> 18 + #include <linux/cfi_types.h> 18 19 #include <asm/assembler.h> 19 20 20 21 .text ··· 621 620 .endm 622 621 623 622 .align 4 624 - SYM_FUNC_START(aesbs_ecb_encrypt) 623 + SYM_TYPED_FUNC_START(aesbs_ecb_encrypt) 625 624 __ecb_crypt aesbs_encrypt8, v0, v1, v4, v6, v3, v7, v2, v5 626 625 SYM_FUNC_END(aesbs_ecb_encrypt) 627 626 628 627 .align 4 629 - SYM_FUNC_START(aesbs_ecb_decrypt) 628 + SYM_TYPED_FUNC_START(aesbs_ecb_decrypt) 630 629 __ecb_crypt aesbs_decrypt8, v0, v1, v6, v4, v2, v7, v3, v5 631 630 SYM_FUNC_END(aesbs_ecb_decrypt) 632 631 ··· 800 799 ret 801 800 .endm 802 801 803 - SYM_FUNC_START(aesbs_xts_encrypt) 802 + SYM_TYPED_FUNC_START(aesbs_xts_encrypt) 804 803 __xts_crypt aesbs_encrypt8, v0, v1, v4, v6, v3, v7, v2, v5 805 804 SYM_FUNC_END(aesbs_xts_encrypt) 806 805 807 - SYM_FUNC_START(aesbs_xts_decrypt) 806 + SYM_TYPED_FUNC_START(aesbs_xts_decrypt) 808 807 __xts_crypt aesbs_decrypt8, v0, v1, v6, v4, v2, v7, v3, v5 809 808 SYM_FUNC_END(aesbs_xts_decrypt) 810 809