Skip to contentSkip to conversation

crypto: x86/chacha - only unregister algorithms if registered

PATCH In review Eric Biggers 3 participants 3 messages Nov 18, 2019 – Nov 22, 2019

Subsystems (2)
x86 Crypto API
lore
Share & tools
lore

Eric Biggers

author
#0 lore raw

PATCH 1/1 crypto: x86/chacha - only unregister algorithms if registered

From: Eric Biggers <[email protected]>

It's not valid to call crypto_unregister_skciphers() without a prior call to crypto_register_skciphers().

Fixes 84e03fa39fbe ("crypto: x86/chacha - expose SIMD ChaCha routine as library function")
Signed-off-by Eric Biggers <[email protected]>
---
 arch/x86/crypto/chacha_glue.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
arch/x86/crypto/chacha_glue.c +2 -1
index b391e13a9e41..a94e30b6f941 100644
@@ -304,7 +304,8 @@ static int __init chacha_simd_mod_init(void)
 
 static void __exit chacha_simd_mod_fini(void)
 {
-	crypto_unregister_skciphers(algs, ARRAY_SIZE(algs));
+	if (boot_cpu_has(X86_FEATURE_SSSE3))
+		crypto_unregister_skciphers(algs, ARRAY_SIZE(algs));
 }
 
 module_init(chacha_simd_mod_init);
Signature · 1 line
2.24.0
Acked-by on v1 1/1
#1 lore raw
Quoted 8 lines · Eric Biggers

From: Eric Biggers <[email protected]>

It's not valid to call crypto_unregister_skciphers() without a prior call to crypto_register_skciphers().

Fixes 84e03fa39fbe ("crypto: x86/chacha - expose SIMD ChaCha routine as library function")
Signed-off-by Eric Biggers <[email protected]>
Acked-by Ard Biesheuvel <[email protected]>
Quoted 21 lines
---
 arch/x86/crypto/chacha_glue.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
arch/x86/crypto/chacha_glue.c +2 -2
index b391e13a9e41..a94e30b6f941 100644
@@ -304,7 +304,8 @@ static int __init chacha_simd_mod_init(void)
 
 static void __exit chacha_simd_mod_fini(void)
 {
-       crypto_unregister_skciphers(algs, ARRAY_SIZE(algs));
+       if (boot_cpu_has(X86_FEATURE_SSSE3))
+               crypto_unregister_skciphers(algs, ARRAY_SIZE(algs));
 }
 
 module_init(chacha_simd_mod_init);
--

2.24.0

maintainer
#2 lore raw
In reply to Eric Biggers
Quoted 10 lines · Eric Biggers

From: Eric Biggers <[email protected]>

It's not valid to call crypto_unregister_skciphers() without a prior call to crypto_register_skciphers().

Fixes 84e03fa39fbe ("crypto: x86/chacha - expose SIMD ChaCha routine as library function")
Signed-off-by Eric Biggers <[email protected]>
---
 arch/x86/crypto/chacha_glue.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Patch applied. Thanks.

Signature · 3 lines
Email: Herbert Xu <[email protected]>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt