drop queue-6.6/crypto-api-fix-boot-up-self-test-race.patch

diff --git a/queue-6.6/crypto-api-fix-boot-up-self-test-race.patch b/queue-6.6/crypto-api-fix-boot-up-self-test-race.patch
deleted file mode 100644 (file)
index 4a3b3c1..0000000
--- a/queue-6.6/crypto-api-fix-boot-up-self-test-race.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From a144664791bfadf0ee3696eab865318a189b3783 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Fri, 15 Nov 2024 09:29:02 +0800
-Subject: crypto: api - Fix boot-up self-test race
-
-From: Herbert Xu <herbert@gondor.apana.org.au>
-
-[ Upstream commit 8dd458cbc5be9ce4427ffce7a9dcdbff4dfc4ac9 ]
-
-During the boot process self-tests are postponed so that all
-algorithms are registered when the test starts.  In the event
-that algorithms are still being registered during these tests,
-which can occur either because the algorithm is registered at
-late_initcall, or because a self-test itself triggers the creation
-of an instance, some self-tests may never start at all.
-
-Fix this by setting the flag at the start of crypto_start_tests.
-
-Note that this race is theoretical and has never been observed
-in practice.
-
-Fixes: adad556efcdd ("crypto: api - Fix built-in testing dependency failures")
-Signed-off-by: Herbert Xu <herbert.xu@redhat.com>
-Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- crypto/algapi.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/crypto/algapi.c b/crypto/algapi.c
-index b3a6086042530..f287085a21fa2 100644
---- a/crypto/algapi.c
-+++ b/crypto/algapi.c
-@@ -1059,6 +1059,8 @@ static void __init crypto_start_tests(void)
-       if (IS_ENABLED(CONFIG_CRYPTO_MANAGER_DISABLE_TESTS))
-               return;
- 
-+      set_crypto_boot_test_finished();
-+
-       for (;;) {
-               struct crypto_larval *larval = NULL;
-               struct crypto_alg *q;
-@@ -1091,8 +1093,6 @@ static void __init crypto_start_tests(void)
- 
-               crypto_wait_for_test(larval);
-       }
--
--      set_crypto_boot_test_finished();
- }
- 
- static int __init crypto_algapi_init(void)
--- 
-2.39.5
-

diff --git a/queue-6.6/series b/queue-6.6/series
index 0788ac54090692a81a45d6d930d7a627d57ae8d2..c81dfa09984d9f4854cd526bf11452bcb5a62ab0 100644 (file)
--- a/queue-6.6/series
+++ b/queue-6.6/series
@@ -155,7 +155,6 @@ tools-testing-selftests-bpf-test_tc_tunnel.sh-fix-wa.patch
 libbpf-fix-segfault-due-to-libelf-functions-not-sett.patch
 asoc-sun4i-spdif-add-clock-multiplier-settings.patch
 selftests-bpf-fix-fill_link_info-selftest-on-powerpc.patch
-crypto-api-fix-boot-up-self-test-race.patch
 crypto-caam-use-jobr-s-space-to-access-page-0-regs.patch
 perf-header-fix-one-memory-leakage-in-process_bpf_bt.patch
 perf-header-fix-one-memory-leakage-in-process_bpf_pr.patch