diff options
| author |   Hangbin Liu <liuhangbin@gmail.com> | 2021-06-03 01:53:40 -0400 |
|---|---|---|
| committer |   Herbert Xu <herbert@gondor.apana.org.au> | 2021-06-11 15:03:29 +0800 |
| commit | 1b82435d17774f3eaab35dce239d354548aa9da2 (patch) | |
| tree | 4121f811a7434a292843e62453ee7ddd4f145bb8 /arch/x86/crypto | |
| parent | crypto: qce - fix error return code in qce_skcipher_async_req_handle() (diff) | |
| download | linux-dev-1b82435d17774f3eaab35dce239d354548aa9da2.tar.xz linux-dev-1b82435d17774f3eaab35dce239d354548aa9da2.zip | |
crypto: x86/curve25519 - fix cpu feature checking logic in mod_exit
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>
Diffstat (limited to 'arch/x86/crypto')
| -rw-r--r-- | arch/x86/crypto/curve25519-x86_64.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/crypto/curve25519-x86_64.c b/arch/x86/crypto/curve25519-x86_64.c index 6706b6cb1d0f..38caf61cd5b7 100644 --- a/arch/x86/crypto/curve25519-x86_64.c +++ b/arch/x86/crypto/curve25519-x86_64.c @@ -1500,7 +1500,7 @@ static int __init curve25519_mod_init(void) static void __exit curve25519_mod_exit(void) { if (IS_REACHABLE(CONFIG_CRYPTO_KPP) && - (boot_cpu_has(X86_FEATURE_BMI2) || boot_cpu_has(X86_FEATURE_ADX))) + static_branch_likely(&curve25519_use_bmi2_adx)) crypto_unregister_kpp(&curve25519_alg); } |