| Message ID | 20221011204645.1160916-6-Jason@zx2c4.com |
|---|---|
| State | New |
| Headers | show |
| Series | rerandomize RNG seeds on reboot and handle record&replay | expand |
On Wed, 12 Oct 2022 05:46:42 +0900, Jason A. Donenfeld wrote: > > When the system reboots, the rng-seed that the FDT has should be > re-randomized, so that the new boot gets a new seed. Since the FDT is in > the ROM region at this point, we add a hook right after the ROM has been > added, so that we have a pointer to that copy of the FDT. > > Cc: Yoshinori Sato <ysato@users.sourceforge.jp> > Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com> > --- > hw/rx/rx-gdbsim.c | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/hw/rx/rx-gdbsim.c b/hw/rx/rx-gdbsim.c > index 8ffe1b8035..198d048964 100644 > --- a/hw/rx/rx-gdbsim.c > +++ b/hw/rx/rx-gdbsim.c > @@ -25,6 +25,7 @@ > #include "hw/rx/rx62n.h" > #include "sysemu/qtest.h" > #include "sysemu/device_tree.h" > +#include "sysemu/reset.h" > #include "hw/boards.h" > #include "qom/object.h" > > @@ -148,6 +149,8 @@ static void rx_gdbsim_init(MachineState *machine) > dtb_offset = ROUND_DOWN(machine->ram_size - dtb_size, 16); > rom_add_blob_fixed("dtb", dtb, dtb_size, > SDRAM_BASE + dtb_offset); > + qemu_register_reset(qemu_fdt_randomize_seeds, > + rom_ptr(SDRAM_BASE + dtb_offset, dtb_size)); > /* Set dtb address to R1 */ > RX_CPU(first_cpu)->env.regs[1] = SDRAM_BASE + dtb_offset; > } > -- > 2.37.3 > Reviewed-by: Yoshinori Sato <ysato@users.sourceforge.jp>
diff --git a/hw/rx/rx-gdbsim.c b/hw/rx/rx-gdbsim.c index 8ffe1b8035..198d048964 100644 --- a/hw/rx/rx-gdbsim.c +++ b/hw/rx/rx-gdbsim.c @@ -25,6 +25,7 @@ #include "hw/rx/rx62n.h" #include "sysemu/qtest.h" #include "sysemu/device_tree.h" +#include "sysemu/reset.h" #include "hw/boards.h" #include "qom/object.h" @@ -148,6 +149,8 @@ static void rx_gdbsim_init(MachineState *machine) dtb_offset = ROUND_DOWN(machine->ram_size - dtb_size, 16); rom_add_blob_fixed("dtb", dtb, dtb_size, SDRAM_BASE + dtb_offset); + qemu_register_reset(qemu_fdt_randomize_seeds, + rom_ptr(SDRAM_BASE + dtb_offset, dtb_size)); /* Set dtb address to R1 */ RX_CPU(first_cpu)->env.regs[1] = SDRAM_BASE + dtb_offset; }
When the system reboots, the rng-seed that the FDT has should be re-randomized, so that the new boot gets a new seed. Since the FDT is in the ROM region at this point, we add a hook right after the ROM has been added, so that we have a pointer to that copy of the FDT. Cc: Yoshinori Sato <ysato@users.sourceforge.jp> Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com> --- hw/rx/rx-gdbsim.c | 3 +++ 1 file changed, 3 insertions(+)