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

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



sm3_transform_avx() is called via indirect function calls.  Therefore it
needs to use SYM_TYPED_FUNC_START instead of SYM_FUNC_START to cause its
type hash 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 call).

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 a1d72fa3

arch/x86/crypto/sm3-avx-asm_64.S

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



#include <linux/linkage.h>

#include <linux/cfi_types.h>

#include <asm/frame.h>



/* Context structure */
@@ -328,7 +329,7 @@ 
 *                        const u8 *data, int nblocks);

 */

.align 16

SYM_FUNC_START(sm3_transform_avx)

SYM_TYPED_FUNC_START(sm3_transform_avx)

	/* input:

	 *	%rdi: ctx, CTX

	 *	%rsi: data (64*nblks bytes)