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

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



crypto_aegis128_aesni_enc(), crypto_aegis128_aesni_enc_tail(),
crypto_aegis128_aesni_dec(), and crypto_aegis128_aesni_dec_tail() 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 didn't
happen to optimize out the indirect calls).

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>
Signed-off-by: default avatarEric Biggers <ebiggers@google.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 57ddfecc

arch/x86/crypto/aegis128-aesni-asm.S

+5 −4
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>



#define STATE0	%xmm0
@@ -402,7 +403,7 @@ SYM_FUNC_END(crypto_aegis128_aesni_ad) 
 * void crypto_aegis128_aesni_enc(void *state, unsigned int length,

 *                                const void *src, void *dst);

 */

SYM_FUNC_START(crypto_aegis128_aesni_enc)

SYM_TYPED_FUNC_START(crypto_aegis128_aesni_enc)

	FRAME_BEGIN



	cmp $0x10, LEN
@@ -499,7 +500,7 @@ SYM_FUNC_END(crypto_aegis128_aesni_enc) 
 * void crypto_aegis128_aesni_enc_tail(void *state, unsigned int length,

 *                                     const void *src, void *dst);

 */

SYM_FUNC_START(crypto_aegis128_aesni_enc_tail)

SYM_TYPED_FUNC_START(crypto_aegis128_aesni_enc_tail)

	FRAME_BEGIN



	/* load the state: */
@@ -556,7 +557,7 @@ SYM_FUNC_END(crypto_aegis128_aesni_enc_tail) 
 * void crypto_aegis128_aesni_dec(void *state, unsigned int length,

 *                                const void *src, void *dst);

 */

SYM_FUNC_START(crypto_aegis128_aesni_dec)

SYM_TYPED_FUNC_START(crypto_aegis128_aesni_dec)

	FRAME_BEGIN



	cmp $0x10, LEN
@@ -653,7 +654,7 @@ SYM_FUNC_END(crypto_aegis128_aesni_dec) 
 * void crypto_aegis128_aesni_dec_tail(void *state, unsigned int length,

 *                                     const void *src, void *dst);

 */

SYM_FUNC_START(crypto_aegis128_aesni_dec_tail)

SYM_TYPED_FUNC_START(crypto_aegis128_aesni_dec_tail)

	FRAME_BEGIN



	/* load the state: */