]> git.ipfire.org Git - thirdparty/kernel/stable.git/commit
crypto: x86/curve25519 - fix cpu feature checking logic in mod_exit
authorHangbin Liu <liuhangbin@gmail.com>
Thu, 3 Jun 2021 05:53:40 +0000 (01:53 -0400)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 14 Jul 2021 14:59:34 +0000 (16:59 +0200)
commit828575bc1b9592556c0d0f49f443f350276a501f
treec3624c02e82d404fcf2015a2ecc09690f0e76684
parent9031614e7374c66a15395085d8ece2d50deebe6e
crypto: x86/curve25519 - fix cpu feature checking logic in mod_exit

[ Upstream commit 1b82435d17774f3eaab35dce239d354548aa9da2 ]

In curve25519_mod_init() the curve25519_alg will be registered only when
(X86_FEATURE_BMI2 && X86_FEATURE_ADX). But in curve25519_mod_exit()
it still checks (X86_FEATURE_BMI2 || X86_FEATURE_ADX) when do crypto
unregister. This will trigger a BUG_ON in crypto_unregister_alg() as
alg->cra_refcnt is 0 if the cpu only supports one of X86_FEATURE_BMI2
and X86_FEATURE_ADX.

Fixes: 07b586fe0662 ("crypto: x86/curve25519 - replace with formally verified implementation")
Signed-off-by: Hangbin Liu <liuhangbin@gmail.com>
Reviewed-by: Jason A. Donenfeld <Jason@zx2c4.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: Sasha Levin <sashal@kernel.org>
arch/x86/crypto/curve25519-x86_64.c