diff options
| author | Eric Biggers <ebiggers@google.com> | 2022-11-18 20:44:13 +0100 |
|---|---|---|
| committer | Herbert Xu <herbert@gondor.apana.org.au> | 2022-11-25 10:39:19 +0100 |
| commit | 32f34bf7e44eeaa241fb845d6f52af5104bc30fd (patch) | |
| tree | e320c7f7e4fa2114be3f52e6cfa0747d33a740c7 /arch/x86/crypto/sha1_ssse3_asm.S | |
| parent | crypto: x86/nhpoly1305 - eliminate unnecessary CFI wrappers (diff) | |
| download | linux-32f34bf7e44eeaa241fb845d6f52af5104bc30fd.tar.xz linux-32f34bf7e44eeaa241fb845d6f52af5104bc30fd.zip | |
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: ccace936eec7 ("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>
Diffstat (limited to '')
| -rw-r--r-- | arch/x86/crypto/sha1_ssse3_asm.S | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/x86/crypto/sha1_ssse3_asm.S b/arch/x86/crypto/sha1_ssse3_asm.S index 263f916362e0..f54988c80eb4 100644 --- a/arch/x86/crypto/sha1_ssse3_asm.S +++ b/arch/x86/crypto/sha1_ssse3_asm.S @@ -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 |