git.openwrt.org Git - openwrt/staging/aparcar.git/blob

   1 From 4fa6b436d97e44deef404676d150ed4c13d63bba Mon Sep 17 00:00:00 2001
   2 From: Eric Biggers <ebiggers@google.com>
   3 Date: Sun, 17 Nov 2019 23:21:58 -0800
   4 Subject: [PATCH 035/124] crypto: x86/chacha - only unregister algorithms if
   5  registered
   6
   7 commit b62755aed3a3f5ca9edd2718339ccea3b6bbbe57 upstream.
   8
   9 It's not valid to call crypto_unregister_skciphers() without a prior
  10 call to crypto_register_skciphers().
  11
  12 Fixes: 84e03fa39fbe ("crypto: x86/chacha - expose SIMD ChaCha routine as library function")
  13 Signed-off-by: Eric Biggers <ebiggers@google.com>
  14 Acked-by: Ard Biesheuvel <ardb@kernel.org>
  15 Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
  16 Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
  17 ---
  18  arch/x86/crypto/chacha_glue.c | 3 ++-
  19  1 file changed, 2 insertions(+), 1 deletion(-)
  20
  21 --- a/arch/x86/crypto/chacha_glue.c
  22 +++ b/arch/x86/crypto/chacha_glue.c
  23 @@ -304,7 +304,8 @@ static int __init chacha_simd_mod_init(v
  24
  25  static void __exit chacha_simd_mod_fini(void)
  26  {
  27 -       crypto_unregister_skciphers(algs, ARRAY_SIZE(algs));
  28 +       if (boot_cpu_has(X86_FEATURE_SSSE3))
  29 +               crypto_unregister_skciphers(algs, ARRAY_SIZE(algs));
  30  }
  31
  32  module_init(chacha_simd_mod_init);