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

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



sha512_transform_ssse3(), sha512_transform_avx(), and
sha512_transform_rorx() 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 19940ebb

arch/x86/crypto/sha512-avx-asm.S

+2 −1
Original line number Diff line number Diff line
@@ -48,6 +48,7 @@ 
########################################################################



#include <linux/linkage.h>

#include <linux/cfi_types.h>



.text
@@ -273,7 +274,7 @@ frame_size = frame_WK + WK_SIZE 
# of SHA512 message blocks.

# "blocks" is the message length in SHA512 blocks

########################################################################

SYM_FUNC_START(sha512_transform_avx)

SYM_TYPED_FUNC_START(sha512_transform_avx)

	test msglen, msglen

	je nowork

arch/x86/crypto/sha512-avx2-asm.S

+2 −1
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ 
########################################################################



#include <linux/linkage.h>

#include <linux/cfi_types.h>



.text
@@ -565,7 +566,7 @@ frame_size = frame_CTX + CTX_SIZE 
# of SHA512 message blocks.

# "blocks" is the message length in SHA512 blocks

########################################################################

SYM_FUNC_START(sha512_transform_rorx)

SYM_TYPED_FUNC_START(sha512_transform_rorx)

	# Save GPRs

	push	%rbx

	push	%r12

arch/x86/crypto/sha512-ssse3-asm.S

+2 −1
Original line number Diff line number Diff line
@@ -48,6 +48,7 @@ 
########################################################################



#include <linux/linkage.h>

#include <linux/cfi_types.h>



.text
@@ -274,7 +275,7 @@ frame_size = frame_WK + WK_SIZE 
# of SHA512 message blocks.

# "blocks" is the message length in SHA512 blocks.

########################################################################

SYM_FUNC_START(sha512_transform_ssse3)

SYM_TYPED_FUNC_START(sha512_transform_ssse3)



	test msglen, msglen

	je nowork