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

Browse source

[ Upstream commit 19940ebbb5 ]

sha256_transform_ssse3(), sha256_transform_avx(),
sha256_transform_rorx(), and sha256_ni_transform() 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: ccace936ee ("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>

...

This commit is contained in:

Eric Biggers 2022-11-18 11:44:14 -08:00 • committed by Greg Kroah-Hartman

parent f3b1021db6

commit 76994f2622

4 changed files with 8 additions and 4 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

3

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

View file

3

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

View file

3

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

View file

3

arch/x86/crypto/sha256_ni_asm.S

View file