From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Fri, 10 Oct 2025 11:00:54 +0000 (+0200)
Subject: 6.6-stable patches
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=41358288417e05ac010d4bcb1e1d4c58d2c8daae;p=thirdparty%2Fkernel%2Fstable-queue.git

6.6-stable patches

added patches:
	crypto-rng-ensure-set_ent-is-always-present.patch
---

diff --git a/queue-6.6/crypto-rng-ensure-set_ent-is-always-present.patch b/queue-6.6/crypto-rng-ensure-set_ent-is-always-present.patch
new file mode 100644
index 0000000000..1a62f63da2
--- /dev/null
+++ b/queue-6.6/crypto-rng-ensure-set_ent-is-always-present.patch
@@ -0,0 +1,43 @@
+From c0d36727bf39bb16ef0a67ed608e279535ebf0da Mon Sep 17 00:00:00 2001
+From: Herbert Xu <herbert@gondor.apana.org.au>
+Date: Thu, 2 Oct 2025 17:45:39 +0800
+Subject: crypto: rng - Ensure set_ent is always present
+
+From: Herbert Xu <herbert@gondor.apana.org.au>
+
+commit c0d36727bf39bb16ef0a67ed608e279535ebf0da upstream.
+
+Ensure that set_ent is always set since only drbg provides it.
+
+Fixes: 77ebdabe8de7 ("crypto: af_alg - add extra parameters for DRBG interface")
+Reported-by: Yiqi Sun <sunyiqixm@gmail.com>
+Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ crypto/rng.c |    8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+--- a/crypto/rng.c
++++ b/crypto/rng.c
+@@ -197,6 +197,11 @@ out:
+ EXPORT_SYMBOL_GPL(crypto_del_default_rng);
+ #endif
+ 
++static void rng_default_set_ent(struct crypto_rng *tfm, const u8 *data,
++				unsigned int len)
++{
++}
++
+ int crypto_register_rng(struct rng_alg *alg)
+ {
+ 	struct crypto_istat_rng *istat = rng_get_stat(alg);
+@@ -212,6 +217,9 @@ int crypto_register_rng(struct rng_alg *
+ 	if (IS_ENABLED(CONFIG_CRYPTO_STATS))
+ 		memset(istat, 0, sizeof(*istat));
+ 
++	if (!alg->set_ent)
++		alg->set_ent = rng_default_set_ent;
++
+ 	return crypto_register_alg(base);
+ }
+ EXPORT_SYMBOL_GPL(crypto_register_rng);
diff --git a/queue-6.6/series b/queue-6.6/series
index 4e8be348e0..89df0f58c2 100644
--- a/queue-6.6/series
+++ b/queue-6.6/series
@@ -23,3 +23,4 @@ staging-axis-fifo-flush-rx-fifo-on-read-errors.patch
 driver-core-pm-set-power.no_callbacks-along-with-power.no_pm.patch
 riscv-mm-use-hint-address-in-mmap-if-available.patch
 riscv-mm-do-not-restrict-mmap-address-based-on-hint.patch
+crypto-rng-ensure-set_ent-is-always-present.patch