On Mon, 18 Nov 2019 at 08:22, Eric Biggers <ebiggers@xxxxxxxxxx> wrote:
>
> From: Eric Biggers <ebiggers@xxxxxxxxxx>
>
> 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@xxxxxxxxxx>
Acked-by: Ard Biesheuvel <ardb@xxxxxxxxxx>
> ---
> arch/x86/crypto/chacha_glue.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/arch/x86/crypto/chacha_glue.c b/arch/x86/crypto/chacha_glue.c
> index b391e13a9e41..a94e30b6f941 100644
> --- 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);
> --
> 2.24.0
>
