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

crypto: x86/aria - fix crash with CFI enabled 



aria_aesni_avx_encrypt_16way(), aria_aesni_avx_decrypt_16way(),
aria_aesni_avx_ctr_crypt_16way(), aria_aesni_avx_gfni_encrypt_16way(),
aria_aesni_avx_gfni_decrypt_16way(), and
aria_aesni_avx_gfni_ctr_crypt_16way() 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.

Fixes: ccace936 ("x86: Add types to indirectly called assembly functions")
Acked-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Reviewed-by: default avatarSami Tolvanen <samitolvanen@google.com>
Cc: Taehee Yoo <ap420073@gmail.com>
Signed-off-by: default avatarEric Biggers <ebiggers@google.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 8bd9974b

arch/x86/crypto/aria-aesni-avx-asm_64.S

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



#include <linux/linkage.h>

#include <linux/cfi_types.h>

#include <asm/frame.h>



/* struct aria_ctx: */
@@ -913,7 +914,7 @@ SYM_FUNC_START_LOCAL(__aria_aesni_avx_crypt_16way) 
	RET;

SYM_FUNC_END(__aria_aesni_avx_crypt_16way)



SYM_FUNC_START(aria_aesni_avx_encrypt_16way)

SYM_TYPED_FUNC_START(aria_aesni_avx_encrypt_16way)

	/* input:

	*      %rdi: ctx, CTX

	*      %rsi: dst
@@ -938,7 +939,7 @@ SYM_FUNC_START(aria_aesni_avx_encrypt_16way) 
	RET;

SYM_FUNC_END(aria_aesni_avx_encrypt_16way)



SYM_FUNC_START(aria_aesni_avx_decrypt_16way)

SYM_TYPED_FUNC_START(aria_aesni_avx_decrypt_16way)

	/* input:

	*      %rdi: ctx, CTX

	*      %rsi: dst
@@ -1039,7 +1040,7 @@ SYM_FUNC_START_LOCAL(__aria_aesni_avx_ctr_gen_keystream_16way) 
	RET;

SYM_FUNC_END(__aria_aesni_avx_ctr_gen_keystream_16way)



SYM_FUNC_START(aria_aesni_avx_ctr_crypt_16way)

SYM_TYPED_FUNC_START(aria_aesni_avx_ctr_crypt_16way)

	/* input:

	*      %rdi: ctx

	*      %rsi: dst
@@ -1208,7 +1209,7 @@ SYM_FUNC_START_LOCAL(__aria_aesni_avx_gfni_crypt_16way) 
	RET;

SYM_FUNC_END(__aria_aesni_avx_gfni_crypt_16way)



SYM_FUNC_START(aria_aesni_avx_gfni_encrypt_16way)

SYM_TYPED_FUNC_START(aria_aesni_avx_gfni_encrypt_16way)

	/* input:

	*      %rdi: ctx, CTX

	*      %rsi: dst
@@ -1233,7 +1234,7 @@ SYM_FUNC_START(aria_aesni_avx_gfni_encrypt_16way) 
	RET;

SYM_FUNC_END(aria_aesni_avx_gfni_encrypt_16way)



SYM_FUNC_START(aria_aesni_avx_gfni_decrypt_16way)

SYM_TYPED_FUNC_START(aria_aesni_avx_gfni_decrypt_16way)

	/* input:

	*      %rdi: ctx, CTX

	*      %rsi: dst
@@ -1258,7 +1259,7 @@ SYM_FUNC_START(aria_aesni_avx_gfni_decrypt_16way) 
	RET;

SYM_FUNC_END(aria_aesni_avx_gfni_decrypt_16way)



SYM_FUNC_START(aria_aesni_avx_gfni_ctr_crypt_16way)

SYM_TYPED_FUNC_START(aria_aesni_avx_gfni_ctr_crypt_16way)

	/* input:

	*      %rdi: ctx

	*      %rsi: dst