| Message ID | 20191118072158.467616-1-ebiggers@kernel.org (mailing list archive) |
|---|---|
| State | Accepted |
| Delegated to: | Herbert Xu |
| Headers | show |
| Series | crypto: x86/chacha - only unregister algorithms if registered | expand |
On Mon, 18 Nov 2019 at 08:22, Eric Biggers <ebiggers@kernel.org> wrote: > > From: Eric Biggers <ebiggers@google.com> > > 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> > --- > 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 >
On Sun, Nov 17, 2019 at 11:21:58PM -0800, Eric Biggers wrote: > From: Eric Biggers <ebiggers@google.com> > > 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> > --- > arch/x86/crypto/chacha_glue.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) Patch applied. Thanks.
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);