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

6.16-stable patches

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

diff --git a/queue-6.16/crypto-rng-ensure-set_ent-is-always-present.patch b/queue-6.16/crypto-rng-ensure-set_ent-is-always-present.patch
new file mode 100644
index 0000000000..3b5a7ee1ae
--- /dev/null
+++ b/queue-6.16/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
+@@ -168,6 +168,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_alg *base = &alg->base;
+@@ -179,6 +184,9 @@ int crypto_register_rng(struct rng_alg *
+ 	base->cra_flags &= ~CRYPTO_ALG_TYPE_MASK;
+ 	base->cra_flags |= CRYPTO_ALG_TYPE_RNG;
+ 
++	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.16/series b/queue-6.16/series
index c545803249..f11bb8df77 100644
--- a/queue-6.16/series
+++ b/queue-6.16/series
@@ -35,3 +35,4 @@ staging-axis-fifo-fix-tx-handling-on-copy_from_user-failure.patch
 staging-axis-fifo-flush-rx-fifo-on-read-errors.patch
 driver-core-faux-set-power.no_pm-for-faux-devices.patch
 driver-core-pm-set-power.no_callbacks-along-with-power.no_pm.patch
+crypto-rng-ensure-set_ent-is-always-present.patch