]> git.baikalelectronics.ru Git - kernel.git/commit
crypto: x86/aria - fix crash with CFI enabled
authorEric Biggers <ebiggers@google.com>
Fri, 18 Nov 2022 19:44:11 +0000 (11:44 -0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 31 Dec 2022 12:32:34 +0000 (13:32 +0100)
commit13689599b4a5b8c5cf49eaafbe8a95a26e1dccbc
tree585d377adc8862843e15cf64b3560ab90b2ba07f
parentb44bd9d3b26535e536ecee24bdecce82b9889ab8
crypto: x86/aria - fix crash with CFI enabled

[ Upstream commit 20d0f0640f148b069d89652a5001d63af67fcdf4 ]

aria_aesni_avx_encrypt_16way(), aria_aesni_avx_decrypt_16way(),
aria_aesni_avx_ctr_crypt_16way(), aria_aesni_avx_gfni_encrypt_16way(),
aria_aesni_avx_gfni_decrypt_16way(), and
aria_aesni_avx_gfni_ctr_crypt_16way() 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.

Fixes: 152ccc317150 ("x86: Add types to indirectly called assembly functions")
Acked-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Reviewed-by: Sami Tolvanen <samitolvanen@google.com>
Cc: Taehee Yoo <ap420073@gmail.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/aria-aesni-avx-asm_64.S