target/linux/generic/backport-5.4/080-wireguard-0035-crypto-x86-chacha-only-unregister-algorithms-if-regi.patch

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