From: Jay Wang <wanjay@amazon.com>
To: <stable@vger.kernel.org>
Cc: Herbert Xu <herbert@gondor.apana.org.au>,
"David S . Miller" <davem@davemloft.net>,
<linux-crypto@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
<wanjay@amazon.com>
Subject: [PATCH 2/2] Override drivers/char/random only after FIPS-mode RNGs become available
Date: Sat, 28 Jun 2025 04:29:18 +0000 [thread overview]
Message-ID: <20250628042918.32253-3-wanjay@amazon.com> (raw)
In-Reply-To: <20250628042918.32253-1-wanjay@amazon.com>
This commit fixes a timing issue introduced in the previous commit
"crypto: rng - Override drivers/char/random in FIPS mode" where the crypto RNG
was attempting to override the drivers/char/random interface before the default
RNG became available. The previous implementation would immediately register the
external RNG during module initialization, which could fail if the default RNG
wasn't ready.
Changes:
- Introduce workqueue-based initialization for FIPS mode
- Add crypto_rng_register_work_func() to wait for default RNG availability
- Move random_register_extrng() call to the work function with proper error handling
This ensures the crypto ext RNG is properly registered only after all dependencies
are satisfied, preventing potential boot failures in FIPS-enabled environments.
Cc: stable@vger.kernel.org
Signed-off-by: Jay Wang <wanjay@amazon.com>
---
crypto/rng.c | 25 +++++++++++++++++++++++--
1 file changed, 23 insertions(+), 2 deletions(-)
diff --git a/crypto/rng.c b/crypto/rng.c
index cdba806846e2..250166d67fd0 100644
--- a/crypto/rng.c
+++ b/crypto/rng.c
@@ -22,6 +22,7 @@
#include <linux/sched/signal.h>
#include <linux/slab.h>
#include <linux/string.h>
+#include <linux/workqueue.h>
#include <net/netlink.h>
#include "internal.h"
@@ -273,15 +274,35 @@ static const struct random_extrng crypto_devrandom_rng = {
.owner = THIS_MODULE,
};
+static struct work_struct crypto_rng_register_work;
+
+static void crypto_rng_register_work_func(struct work_struct *work)
+{
+ /* Wait until default rng becomes avaiable, then
+ Overwrite the extrng.
+ */
+ int ret = crypto_get_default_rng();
+ if (ret){
+ printk(KERN_ERR "crypto_rng: Failed to get default RNG (error %d)\n", ret);
+ return;
+ }
+ printk(KERN_INFO "Overwrite extrng\n");
+ random_register_extrng(&crypto_devrandom_rng);
+}
+
static int __init crypto_rng_init(void)
{
- if (fips_enabled)
- random_register_extrng(&crypto_devrandom_rng);
+ if (fips_enabled) {
+ INIT_WORK(&crypto_rng_register_work, crypto_rng_register_work_func);
+ schedule_work(&crypto_rng_register_work);
+ }
+
return 0;
}
static void __exit crypto_rng_exit(void)
{
+ cancel_work_sync(&crypto_rng_register_work);
random_unregister_extrng();
}
--
2.47.1
next prev parent reply other threads:[~2025-06-28 4:29 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-06-28 4:29 [PATCH 6.12.y 0/2] crypto: rng - FIPS 140-3 compliance for random number generation Jay Wang
2025-06-28 4:29 ` [PATCH 1/2] crypto: rng - Override drivers/char/random in FIPS mode Jay Wang
2025-06-28 6:11 ` Greg KH
2025-06-28 15:14 ` kernel test robot
2025-06-28 4:29 ` Jay Wang [this message]
2025-06-28 6:12 ` [PATCH 2/2] Override drivers/char/random only after FIPS-mode RNGs become available Greg KH
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250628042918.32253-3-wanjay@amazon.com \
--to=wanjay@amazon.com \
--cc=davem@davemloft.net \
--cc=herbert@gondor.apana.org.au \
--cc=linux-crypto@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox