]> www.infradead.org Git - users/jedix/linux-maple.git/commit
crypto: x86/sha1 - fix possible crash with CFI enabled
authorEric Biggers <ebiggers@google.com>
Fri, 18 Nov 2022 19:44:13 +0000 (11:44 -0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 31 Dec 2022 12:32:34 +0000 (13:32 +0100)
commitf3b1021db697a1f28089019238748c82cedd31ae
treea9a03a2ff01f0ab18de471ef5fd6cf2612eac153
parent8d447b92c3e26d50e87f7491e6bab5bab8eec982
crypto: x86/sha1 - fix possible crash with CFI enabled

[ Upstream commit 32f34bf7e44eeaa241fb845d6f52af5104bc30fd ]

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>
Signed-off-by: Sasha Levin <sashal@kernel.org>
arch/x86/crypto/sha1_ni_asm.S
arch/x86/crypto/sha1_ssse3_asm.S