From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Tue, 16 Nov 2021 11:01:20 +0000 (+0100)
Subject: 5.15-stable patches
X-Git-Tag: v5.4.160~17
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=86e0a644f382a4c5af7b9c10c9c1a8171e42a8f5;p=thirdparty%2Fkernel%2Fstable-queue.git

5.15-stable patches

added patches:
	crypto-api-fix-boot-up-crash-when-crypto-manager-is-disabled.patch
---

diff --git a/queue-5.15/crypto-api-fix-boot-up-crash-when-crypto-manager-is-disabled.patch b/queue-5.15/crypto-api-fix-boot-up-crash-when-crypto-manager-is-disabled.patch
new file mode 100644
index 00000000000..e0eb2ff603d
--- /dev/null
+++ b/queue-5.15/crypto-api-fix-boot-up-crash-when-crypto-manager-is-disabled.patch
@@ -0,0 +1,36 @@
+From beaaaa37c664e9afdf2913aee19185d8e3793b50 Mon Sep 17 00:00:00 2001
+From: Herbert Xu <herbert@gondor.apana.org.au>
+Date: Fri, 5 Nov 2021 15:26:08 +0800
+Subject: crypto: api - Fix boot-up crash when crypto manager is disabled
+
+From: Herbert Xu <herbert@gondor.apana.org.au>
+
+commit beaaaa37c664e9afdf2913aee19185d8e3793b50 upstream.
+
+When the crypto manager is disabled, we need to explicitly set
+the crypto algorithms' tested status so that they can be used.
+
+Fixes: cad439fc040e ("crypto: api - Do not create test larvals if...")
+Reported-by: Geert Uytterhoeven <geert@linux-m68k.org>
+Reported-by: Ido Schimmel <idosch@idosch.org>
+Reported-by: Guenter Roeck <linux@roeck-us.net>
+Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
+Tested-by: Ido Schimmel <idosch@nvidia.com>
+Tested-by: Geert Uytterhoeven <geert@linux-m68k.org>
+Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ crypto/algapi.c |    2 ++
+ 1 file changed, 2 insertions(+)
+
+--- a/crypto/algapi.c
++++ b/crypto/algapi.c
+@@ -284,6 +284,8 @@ static struct crypto_larval *__crypto_re
+ 
+ 	if (larval)
+ 		list_add(&larval->alg.cra_list, &crypto_alg_list);
++	else
++		alg->cra_flags |= CRYPTO_ALG_TESTED;
+ 
+ 	crypto_stats_init(alg);
+ 
diff --git a/queue-5.15/series b/queue-5.15/series
index 668560f2338..5fd502ccb13 100644
--- a/queue-5.15/series
+++ b/queue-5.15/series
@@ -921,3 +921,4 @@ ath10k-fix-invalid-dma_addr_t-token-assignment.patch
 mmc-moxart-fix-null-pointer-dereference-on-pointer-host.patch
 selftests-x86-iopl-adjust-to-the-faked-iopl-cli-sti-usage.patch
 selftests-bpf-fix-also-no-alu32-strobemeta-selftest.patch
+crypto-api-fix-boot-up-crash-when-crypto-manager-is-disabled.patch