Commit 32f34bf7 authored Nov 18, 2022 by Eric Biggers Committed by Herbert Xu Nov 25, 2022

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



sha1_transform_ssse3(), sha1_transform_avx(), and sha1_ni_transform()
(but not sha1_transform_avx2()) 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: Peter Zijlstra (Intel) <peterz@infradead.org>
Reviewed-by: Sami Tolvanen <samitolvanen@google.com>
Signed-off-by: Eric Biggers <ebiggers@google.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

parent 0f8bc4bd

arch/x86/crypto/sha1_ni_asm.S

+2 −1

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

		#include <linux/linkage.h>
		#include <linux/cfi_types.h>

		#define DIGEST_PTR %rdi /* 1st arg */
		#define DATA_PTR %rsi /* 2nd arg */
		@@ -93,7 +94,7 @@
		*/
		.text
		.align 32
		SYM_FUNC_START(sha1_ni_transform)
		SYM_TYPED_FUNC_START(sha1_ni_transform)
		push %rbp
		mov %rsp, %rbp
		sub $FRAME_SIZE, %rsp

arch/x86/crypto/sha1_ssse3_asm.S

+2 −1

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

		#include <linux/linkage.h>
		#include <linux/cfi_types.h>

		#define CTX %rdi // arg1
		#define BUF %rsi // arg2
		@@ -67,7 +68,7 @@
		* param: function's name
		*/
		.macro SHA1_VECTOR_ASM name
		SYM_FUNC_START(\name)
		SYM_TYPED_FUNC_START(\name)

		push %rbx
		push %r12