Commit 47446d7c authored by Eric Biggers's avatar Eric Biggers Committed by Herbert Xu
Browse files

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: c50d3285 ("arm64: Add types to indirect called assembly functions")
Cc: stable@vger.kernel.org
Signed-off-by: default avatarEric Biggers <ebiggers@google.com>
Reviewed-by: default avatarArd Biesheuvel <ardb@kernel.org>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent a1862c3b

arch/arm64/crypto/aes-neonbs-core.S

+5 −4
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
 */



#include <linux/linkage.h>

#include <linux/cfi_types.h>

#include <asm/assembler.h>



	.text
@@ -620,12 +621,12 @@ SYM_FUNC_END(aesbs_decrypt8) 
	.endm



	.align		4

SYM_FUNC_START(aesbs_ecb_encrypt)

SYM_TYPED_FUNC_START(aesbs_ecb_encrypt)

	__ecb_crypt	aesbs_encrypt8, v0, v1, v4, v6, v3, v7, v2, v5

SYM_FUNC_END(aesbs_ecb_encrypt)



	.align		4

SYM_FUNC_START(aesbs_ecb_decrypt)

SYM_TYPED_FUNC_START(aesbs_ecb_decrypt)

	__ecb_crypt	aesbs_decrypt8, v0, v1, v6, v4, v2, v7, v3, v5

SYM_FUNC_END(aesbs_ecb_decrypt)
@@ -799,11 +800,11 @@ SYM_FUNC_END(__xts_crypt8) 
	ret

	.endm



SYM_FUNC_START(aesbs_xts_encrypt)

SYM_TYPED_FUNC_START(aesbs_xts_encrypt)

	__xts_crypt	aesbs_encrypt8, v0, v1, v4, v6, v3, v7, v2, v5

SYM_FUNC_END(aesbs_xts_encrypt)



SYM_FUNC_START(aesbs_xts_decrypt)

SYM_TYPED_FUNC_START(aesbs_xts_decrypt)

	__xts_crypt	aesbs_decrypt8, v0, v1, v6, v4, v2, v7, v3, v5

SYM_FUNC_END(aesbs_xts_decrypt)