qemu/hw-microblaze-pass-random-seed-to-fdt.patch
Jiabo Feng ab7fc8ee5b QEMU update to version 6.2.0-99:
- target/i386: Introduce SapphireRapids-v3 to add missing features
- qtest/fuzz-lsi53c895a-test: set guest RAM to 2G
- hw/net/lan9118: Signal TSFL_INT flag when TX FIFO reaches specified level
- target/arm: Fix alignment for VLD4.32
- hw/microblaze: pass random seed to fdt
- tests/qtest: npcm7xx-emc-test: Skip checking MAC
- tests: mark io-command test as skipped if socat is missing
- tests: unit: add NULL-pointer check
- tests: test-qga: close socket on failure to connect
- vdpa:block device capacity expansion online support vdpa block device update capacity.
- virtio-net: Ensure queue index fits with RSS(CVE-2024-6505)
- nbd/server: CVE-2024-7409: Avoid use-after-free when closing server
- ppc/vof: Fix unaligned FDT property access
- vvfat: Fix reading files with non-continuous clusters
- vvfat: Fix bug in writing to middle of file
- savevm: Fix load_snapshot error path crash
- hw/dma/xilinx_axidma: Use semicolon at end of statement, not comma
- hw/remote/message.c: Don't directly invoke DeviceClass:reset
- crypto/tlscredspsk: Free username on finalize
- hw/display/vhost-user-gpu.c: fix vhost_user_gpu_chr_read()
- virtio: remove virtio_tswap16s() call in vring_packed_event_read()
- char-stdio: Restore blocking mode of stdout on exit
- hw/ppc: spapr: Use qemu_vfree() to free spapr->htab
- smbios: sanitize type from external type before checking have_fields_bitmap
- spapr_pci: fix leak in spapr_phb_vfio_get_loc_code
- KVM: use store-release to mark dirty pages as harvested
- monitor/hmp: print trace as option in help for log command
- tpm_crb: Avoid backend startup just before shutdown under Xen
- crypto/block-luks: make range overlap check more readable
- spapr: Free stdout path
- target/rx: Use target_ulong for address in LI
- virtio-pci: Fix the use of an uninitialized irqfd
- rtl8139: Fix behaviour for old kernels.
- virtio-rng: block max-bytes=0 MIME-Version: 1.0
- hw/audio/es1370: Clean up comment
- vhost-user-server: do not set memory fd non-blocking
- ui: reject extended clipboard message if not activated
- virtio-net: Fix vhost virtqueue notifiers for RSS
- hw/misc/applesmc: Fix memory leak in reset() handler

Signed-off-by: Jiabo Feng <fengjiabo1@huawei.com>
(cherry picked from commit db7a5d9a7239db307c8c1454fab5f8a92fd486b8)
2024-09-18 15:37:32 +08:00

55 lines
1.8 KiB
Diff

From 74e95f7071c8d8f40b352992b19c967655459b31 Mon Sep 17 00:00:00 2001
From: tangbinzy <tangbin_yewu@cmss.chinamobile.com>
Date: Mon, 9 Sep 2024 08:20:28 +0000
Subject: [PATCH] hw/microblaze: pass random seed to fdt mainline inclusion
commit b91b6b5a2cd83a096116929dfc8e016091080adc category: bugfix
---------------------------------------------------------------
If the FDT contains /chosen/rng-seed, then the Linux RNG will use it to
initialize early. Set this using the usual guest random number
generation function. This FDT node is part of the DT specification.
Reviewed-by: Edgar E. Iglesias <edgar.iglesias@gmail.com>
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
Signed-off-by: Edgar E. Iglesias <edgar.iglesias@amd.com>
Signed-off-by: tangbinzy <tangbin_yewu@cmss.chinamobile.com>
---
hw/microblaze/boot.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/hw/microblaze/boot.c b/hw/microblaze/boot.c
index 8821d009f1..26f315aaea 100644
--- a/hw/microblaze/boot.c
+++ b/hw/microblaze/boot.c
@@ -31,6 +31,7 @@
#include "qemu/option.h"
#include "qemu/config-file.h"
#include "qemu/error-report.h"
+#include "qemu/guest-random.h"
#include "sysemu/device_tree.h"
#include "sysemu/reset.h"
#include "hw/boards.h"
@@ -76,6 +77,7 @@ static int microblaze_load_dtb(hwaddr addr,
int fdt_size;
void *fdt = NULL;
int r;
+ uint8_t rng_seed[32];
if (dtb_filename) {
fdt = load_device_tree(dtb_filename, &fdt_size);
@@ -84,6 +86,9 @@ static int microblaze_load_dtb(hwaddr addr,
return 0;
}
+ qemu_guest_getrandom_nofail(rng_seed, sizeof(rng_seed));
+ qemu_fdt_setprop(fdt, "/chosen", "rng-seed", rng_seed, sizeof(rng_seed));
+
if (kernel_cmdline) {
r = qemu_fdt_setprop_string(fdt, "/chosen", "bootargs",
kernel_cmdline);
--
2.41.0.windows.1