[PATCH] crypto: arm64/sm4 - fix possible crash with CFI enabled

Herbert Xu herbert at gondor.apana.org.au
Fri Dec 30 07:15:42 PST 2022


On Wed, Dec 21, 2022 at 03:32:32PM +0800, Tianjia Zhang wrote:
> The SM4 CCM/GCM assembly functions for encryption and decryption is
> called via indirect function calls.  Therefore they need to use
> SYM_TYPED_FUNC_START instead of SYM_FUNC_START to cause its type hash
> 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 call).
> 
> Fixes: 67fa3a7fdf80 ("crypto: arm64/sm4 - add CE implementation for CCM mode")
> Fixes: ae1b83c7d572 ("crypto: arm64/sm4 - add CE implementation for GCM mode")
> Signed-off-by: Tianjia Zhang <tianjia.zhang at linux.alibaba.com>
> ---
>  arch/arm64/crypto/sm4-ce-ccm-core.S | 5 +++--
>  arch/arm64/crypto/sm4-ce-gcm-core.S | 5 +++--
>  2 files changed, 6 insertions(+), 4 deletions(-)

Patch applied.  Thanks.
-- 
Email: Herbert Xu <herbert at gondor.apana.org.au>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt



More information about the linux-arm-kernel mailing list