crypto: x86/chacha - only unregister algorithms if registered

ebiggers · herbertx · commit b62755aed3a3 · 2019-11-22T18:48:39.000+08:00
It's not valid to call crypto_unregister_skciphers() without a prior call to crypto_register_skciphers(). Fixes: 84e03fa ("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>
diff --git a/arch/x86/crypto/chacha_glue.c b/arch/x86/crypto/chacha_glue.c
@@ -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);

Original file line number	Diff line number	Diff line change
`@@ -304,7 +304,8 @@ static int __init chacha_simd_mod_init(void)`
`304`	`304`
`305`	`305`	`static void __exit chacha_simd_mod_fini(void)`
`306`	`306`	`{`
`307`		`- crypto_unregister_skciphers(algs, ARRAY_SIZE(algs));`
	`307`	`+ if (boot_cpu_has(X86_FEATURE_SSSE3))`
	`308`	`+ crypto_unregister_skciphers(algs, ARRAY_SIZE(algs));`
`308`	`309`	`}`
`309`	`310`
`310`	`311`	`module_init(chacha_simd_mod_init);`