From: Paolo Bonzini <pbonzini@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Jason A. Donenfeld" <Jason@zx2c4.com>
Subject: [PULL 03/14] x86: reinitialize RNG seed on system reboot
Date: Thu, 29 Sep 2022 18:30:03 +0200 [thread overview]
Message-ID: <20220929163014.16950-4-pbonzini@redhat.com> (raw)
In-Reply-To: <20220929163014.16950-1-pbonzini@redhat.com>
From: "Jason A. Donenfeld" <Jason@zx2c4.com>
Since this is read from fw_cfg on each boot, the kernel zeroing it out
alone is insufficient to prevent it from being used twice. And indeed on
reboot we always want a new seed, not the old one. So re-fill it in this
circumstance.
Cc: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
Message-Id: <20220921093134.2936487-3-Jason@zx2c4.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
hw/i386/x86.c | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/hw/i386/x86.c b/hw/i386/x86.c
index 1ee0b1b413..f9a4ddaa4a 100644
--- a/hw/i386/x86.c
+++ b/hw/i386/x86.c
@@ -783,6 +783,12 @@ static void reset_setup_data(void *opaque)
stq_p(fixup->pos, fixup->orig_val);
}
+static void reset_rng_seed(void *opaque)
+{
+ SetupData *setup_data = opaque;
+ qemu_guest_getrandom_nofail(setup_data->data, le32_to_cpu(setup_data->len));
+}
+
void x86_load_linux(X86MachineState *x86ms,
FWCfgState *fw_cfg,
int acpi_data_size,
@@ -1105,6 +1111,7 @@ void x86_load_linux(X86MachineState *x86ms,
setup_data->type = cpu_to_le32(SETUP_RNG_SEED);
setup_data->len = cpu_to_le32(RNG_SEED_LENGTH);
qemu_guest_getrandom_nofail(setup_data->data, RNG_SEED_LENGTH);
+ qemu_register_reset(reset_rng_seed, setup_data);
}
fw_cfg_add_i32(fw_cfg, FW_CFG_KERNEL_ADDR, prot_addr);
--
2.37.3
next prev parent reply other threads:[~2022-09-29 18:01 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-29 16:30 [PULL 00/14] x86 + misc changes for 2022-09-29 Paolo Bonzini
2022-09-29 16:30 ` [PULL 01/14] x86: return modified setup_data only if read as memory, not as file Paolo Bonzini
2022-09-29 16:30 ` [PULL 02/14] x86: use typedef for SetupData struct Paolo Bonzini
2022-09-29 16:30 ` Paolo Bonzini [this message]
2022-09-29 16:30 ` [PULL 04/14] x86: re-enable rng seeding via SetupData Paolo Bonzini
2022-09-29 16:30 ` [PULL 05/14] qboot: rebuild based on latest commit Paolo Bonzini
2022-09-29 16:30 ` [PULL 06/14] configure: do not invoke as/ld directly for pc-bios/optionrom Paolo Bonzini
2022-09-29 16:30 ` [PULL 07/14] watchdog: remove -watchdog option Paolo Bonzini
2022-09-29 16:30 ` [PULL 08/14] ui: fix path to dbus-display1.h Paolo Bonzini
2022-09-29 16:30 ` [PULL 09/14] meson: require 0.61.3 Paolo Bonzini
2022-09-29 16:30 ` [PULL 10/14] meson: multiple names can be passed to dependency() Paolo Bonzini
2022-09-29 16:30 ` [PULL 11/14] configure, meson: move C++ compiler detection to meson.build Paolo Bonzini
2022-09-29 16:30 ` [PULL 12/14] configure, meson: move linker flag detection to meson Paolo Bonzini
2022-09-29 16:30 ` [PULL 13/14] target/i386/kvm: fix kvmclock_current_nsec: Assertion `time.tsc_timestamp <= migration_tsc' failed Paolo Bonzini
2022-09-29 16:30 ` [PULL 14/14] x86: re-initialize RNG seed when selecting kernel Paolo Bonzini
2022-09-29 21:02 ` [PULL 00/14] x86 + misc changes for 2022-09-29 Stefan Hajnoczi
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=20220929163014.16950-4-pbonzini@redhat.com \
--to=pbonzini@redhat.com \
--cc=Jason@zx2c4.com \
--cc=qemu-devel@nongnu.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).