OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

hw/arm/virt: dt: add kaslr-seed property

Browse Source 
Generate random seeds to be used by the non-secure and/or secure OSes
for ASLR. The seeds are 64-bit random values exported via the DT
properties /chosen/kaslr-seed [1] and /secure-chosen/kaslr-seed, the
latter being used by OP-TEE [2].

[1] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=e5bc0c37c97e1
[2] https://github.com/OP-TEE/optee_os/commit/ef262691fe0e

Signed-off-by: Jerome Forissier <jerome@forissier.org>
Message-id: 20200420121807.8204-3-jerome@forissier.org
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Jerome Forissier 2020-04-20 14:18:07 +02:00 committed by Peter Maydell
parent ef6a5c71c2
commit 60592cfed2
1 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
hw/arm/virt.c
View File

@ -77,6 +77,7 @@
#include "hw/acpi/generic_event_device.h" #include "hw/acpi/generic_event_device.h"
#include "hw/virtio/virtio-iommu.h" #include "hw/virtio/virtio-iommu.h"
#include "hw/char/pl011.h" #include "hw/char/pl011.h"
#include "qemu/guest-random.h"
#define DEFINE_VIRT_MACHINE_LATEST(major, minor, latest) \ #define DEFINE_VIRT_MACHINE_LATEST(major, minor, latest) \
static void virt_##major##_##minor##_class_init(ObjectClass *oc, \ static void virt_##major##_##minor##_class_init(ObjectClass *oc, \
@ -213,6 +214,18 @@ static bool cpu_type_valid(const char *cpu)
return false; return false;
} }
static void create_kaslr_seed(VirtMachineState *vms, const char *node)
{
Error *err = NULL;
uint64_t seed;
if (qemu_guest_getrandom(&seed, sizeof(seed), &err)) {
error_free(err);
return;
}
qemu_fdt_setprop_u64(vms->fdt, node, "kaslr-seed", seed);
}
static void create_fdt(VirtMachineState *vms) static void create_fdt(VirtMachineState *vms)
{ {
MachineState *ms = MACHINE(vms); MachineState *ms = MACHINE(vms);
@ -233,9 +246,11 @@ static void create_fdt(VirtMachineState *vms)
/* /chosen must exist for load_dtb to fill in necessary properties later */ /* /chosen must exist for load_dtb to fill in necessary properties later */
qemu_fdt_add_subnode(fdt, "/chosen"); qemu_fdt_add_subnode(fdt, "/chosen");
create_kaslr_seed(vms, "/chosen");
if (vms->secure) { if (vms->secure) {
qemu_fdt_add_subnode(fdt, "/secure-chosen"); qemu_fdt_add_subnode(fdt, "/secure-chosen");
create_kaslr_seed(vms, "/secure-chosen");
} }
/* Clock node, for the benefit of the UART. The kernel device tree /* Clock node, for the benefit of the UART. The kernel device tree