]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
6.12-stable patches
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 10 Oct 2025 11:01:04 +0000 (13:01 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 10 Oct 2025 11:01:04 +0000 (13:01 +0200)
added patches:
crypto-rng-ensure-set_ent-is-always-present.patch

queue-6.12/crypto-rng-ensure-set_ent-is-always-present.patch [new file with mode: 0644]
queue-6.12/series

diff --git a/queue-6.12/crypto-rng-ensure-set_ent-is-always-present.patch b/queue-6.12/crypto-rng-ensure-set_ent-is-always-present.patch
new file mode 100644 (file)
index 0000000..b3195c5
--- /dev/null
@@ -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
+@@ -167,6 +167,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;
+@@ -178,6 +183,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);
index 2394e16f8ce3d65454d8a2171b59b5282f098c64..19d7773f70e5e14607173d98bbfeecf1720822e5 100644 (file)
@@ -30,3 +30,4 @@ staging-axis-fifo-fix-maximum-tx-packet-length-check.patch
 staging-axis-fifo-fix-tx-handling-on-copy_from_user-failure.patch
 staging-axis-fifo-flush-rx-fifo-on-read-errors.patch
 driver-core-pm-set-power.no_callbacks-along-with-power.no_pm.patch
+crypto-rng-ensure-set_ent-is-always-present.patch