2019-11-18 07:22:41

by Eric Biggers

Subject: [PATCH] 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(-)

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

2019-11-18 07:27:12

by Ard Biesheuvel

Subject: Re: [PATCH] crypto: x86/chacha - only unregister algorithms if registered

On Mon, 18 Nov 2019 at 08:22, Eric Biggers <[email protected]> wrote:
>
> 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]>

> ---
> 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
>

2019-11-22 11:14:35

by Herbert Xu

Subject: Re: [PATCH] crypto: x86/chacha - only unregister algorithms if registered

On Sun, Nov 17, 2019 at 11:21:58PM -0800, Eric Biggers wrote:
> 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.
--
Email: Herbert Xu <[email protected]>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt