From: "Jason A. Donenfeld" <Jason@zx2c4.com>
To: Geert Uytterhoeven <geert@linux-m68k.org>,
linux-m68k@lists.linux-m68k.org, linux-kernel@vger.kernel.org
Cc: "Jason A. Donenfeld" <Jason@zx2c4.com>
Subject: [PATCH v3 2/3] m68k: virt: generate new RNG seed on reboot
Date: Fri, 23 Sep 2022 19:03:39 +0200 [thread overview]
Message-ID: <20220923170340.4099226-2-Jason@zx2c4.com> (raw)
In-Reply-To: <20220923170340.4099226-1-Jason@zx2c4.com>
Rather than rebooting into a system with no entropy, regenerate the RNG
seed before rebooting, so that the new system has a fresh seed.
Fixes: a1ee38ab1a75 ("m68k: virt: Use RNG seed from bootinfo block")
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
---
arch/m68k/virt/config.c | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/arch/m68k/virt/config.c b/arch/m68k/virt/config.c
index 4ab22946ff68..d4627840e35b 100644
--- a/arch/m68k/virt/config.c
+++ b/arch/m68k/virt/config.c
@@ -45,10 +45,18 @@ static void virt_halt(void)
;
}
+static const struct bi_record *rng_seed_record;
+
static void virt_reset(void)
{
void __iomem *base = (void __iomem *)virt_bi_data.ctrl.mmio;
+ if (rng_seed_record && rng_seed_record->size > sizeof(*rng_seed_record) + 2) {
+ u16 len = rng_seed_record->size - sizeof(*rng_seed_record) - 2;
+ get_random_bytes((u8 *)rng_seed_record->data + 2, len);
+ *(u16 *)rng_seed_record->data = cpu_to_be16(len);
+ }
+
iowrite32be(CMD_RESET, base + VIRT_CTRL_REG_CMD);
local_irq_disable();
while (1)
@@ -101,6 +109,8 @@ int __init virt_parse_bootinfo(const struct bi_record *record)
* length to prevent kexec from using it.
*/
memzero_explicit((void *)data, len + 2);
+ /* Store a reference to be filled in on reboot. */
+ rng_seed_record = record;
break;
}
default:
--
2.37.3
next prev parent reply other threads:[~2022-09-23 17:03 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-23 17:03 [PATCH v3 1/3] m68k: process bootinfo records before saving them Jason A. Donenfeld
2022-09-23 17:03 ` Jason A. Donenfeld [this message]
2022-09-26 10:10 ` [PATCH v3 2/3] m68k: virt: generate new RNG seed on reboot Geert Uytterhoeven
2022-09-26 10:18 ` Jason A. Donenfeld
2022-09-23 17:03 ` [PATCH v3 3/3] m68k: rework BI_VIRT_RNG_SEED as BI_RNG_SEED Jason A. Donenfeld
2022-09-26 10:27 ` Geert Uytterhoeven
2022-09-26 11:08 ` Jason A. Donenfeld
2022-09-26 11:36 ` Jason A. Donenfeld
2022-09-26 9:57 ` [PATCH v3 1/3] m68k: process bootinfo records before saving them Geert Uytterhoeven
2022-09-26 10:06 ` Jason A. Donenfeld
2022-09-26 10:08 ` Geert Uytterhoeven
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=20220923170340.4099226-2-Jason@zx2c4.com \
--to=jason@zx2c4.com \
--cc=geert@linux-m68k.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-m68k@lists.linux-m68k.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;
as well as URLs for NNTP newsgroup(s).