crypto: x86/chacha - only unregister algorithms if registered
authorEric Biggers <ebiggers@google.com>
Mon, 18 Nov 2019 07:21:58 +0000 (23:21 -0800)
committerHerbert Xu <herbert@gondor.apana.org.au>
Fri, 22 Nov 2019 10:48:39 +0000 (18:48 +0800)
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 <ebiggers@google.com>
Acked-by: Ard Biesheuvel <ardb@kernel.org>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
arch/x86/crypto/chacha_glue.c

index b391e13a9e415041e5d89c0556fb2c01007a271a..a94e30b6f941349c31b6fcab7e48ee03c404d844 100644 (file)
@@ -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);