Skip to contentSkip to conversation

hw/arm/virt: Add DT property /secure-chosen/kaslr-seed

PATCH Superseded Jerome Forissier 3 participants 4 messages Apr 10, 2020 – Apr 17, 2020

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 hw/arm/virt: Add DT property /secure-chosen/kaslr-seed

This commit generates a random seed to be used by the secure OS for ASLR when the machine is secure. The seed is a 64-bit random value exported via the DT in /secure-chosen/kaslr-seed. This interface is used by OP-TEE [1].

[1] https://github.com/OP-TEE/optee_os/commit/ef262691fe0e

---
 hw/arm/virt.c | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
hw/arm/virt.c +14 -0
index 7dc96abf72c..42a6f84086f 100644
@@ -77,6 +77,7 @@
 #include "hw/acpi/generic_event_device.h"
 #include "hw/virtio/virtio-iommu.h"
 #include "hw/char/pl011.h"
+#include "crypto/random.h"
 
 #define DEFINE_VIRT_MACHINE_LATEST(major, minor, latest) \
     static void virt_##major##_##minor##_class_init(ObjectClass *oc, \
@@ -1635,6 +1636,18 @@ static void finalize_gic_version(VirtMachineState *vms)
     }
 }
 
+static void create_secure_kaslr_seed(VirtMachineState *vms)
+{
+    Error *err = NULL;
+    uint64_t seed;
+
+    if (qcrypto_random_bytes(&seed, sizeof(seed), &err)) {
+        error_free(err);
+        return;
+    }
+    qemu_fdt_setprop_u64(vms->fdt, "/secure-chosen", "kaslr-seed", seed);
+}
+
 static void machvirt_init(MachineState *machine)
 {
     VirtMachineState *vms = VIRT_MACHINE(machine);
@@ -1837,6 +1850,7 @@ static void machvirt_init(MachineState *machine)
     if (vms->secure) {
         create_secure_ram(vms, secure_sysmem);
         create_uart(vms, VIRT_SECURE_UART, secure_sysmem, serial_hd(1));
+        create_secure_kaslr_seed(vms);
     }
 
     vms->highmem_ecam &= vms->highmem && (!firmware_loaded || aarch64);
Signature · 1 line
2.20.1
#1 lore raw
Quoted 7 lines · Jerome Forissier

This commit generates a random seed to be used by the secure OS for ASLR when the machine is secure. The seed is a 64-bit random value exported via the DT in /secure-chosen/kaslr-seed. This interface is used by OP-TEE [1].

[1] https://github.com/OP-TEE/optee_os/commit/ef262691fe0e

The kernel devicetree documentation documents this as a generic property of /chosen -- should we be providing a /chosen/kaslr-seed too ?

hw/arm/virt.c static void finalize_gic_version(VirtMachineState *vms) · line 1647

Quoted 12 lines

---

hw/arm/virt.c +9 -0
+static void create_secure_kaslr_seed(VirtMachineState *vms)
+{
+    Error *err = NULL;
+    uint64_t seed;
+
+    if (qcrypto_random_bytes(&seed, sizeof(seed), &err)) {
+        error_free(err);
+        return;
+    }

Since this is exposed to the guest I'm wondering if we should use qemu_guest_getrandom() (which lets you make the randomness deterministic for the benefit of record-and-replay). But I'm not sure if that function is usable before the guest has even started running. Pavel, could you answer that?

hw/arm/virt.c static void machvirt_init(MachineState *machine) · line 1853

Quoted 11 lines
hw/arm/virt.c +4 -0
+    qemu_fdt_setprop_u64(vms->fdt, "/secure-chosen", "kaslr-seed", seed);
+}
+
 static void machvirt_init(MachineState *machine)
 {
     VirtMachineState *vms = VIRT_MACHINE(machine);
@@ -1837,6 +1850,7 @@ static void machvirt_init(MachineState *machine)
     if (vms->secure) {
         create_secure_ram(vms, secure_sysmem);
         create_uart(vms, VIRT_SECURE_UART, secure_sysmem, serial_hd(1));
+        create_secure_kaslr_seed(vms);

This is implicitly relying on create_uart() having created the "/secure-chosen" node. I think it would be better now that we have multiple things we might want to put there if we just pulled the "create /secure-chosen" code out to the create_fdt() function so we do it at the same place we create "/chosen". (You can do that as a simple patch of its own that comes before this one in the patchseries.)

hw/arm/virt.c static void machvirt_init(MachineState *machine) · line 1856

Quoted 3 lines
hw/arm/virt.c +0 -0
     }
 
     vms->highmem_ecam &= vms->highmem && (!firmware_loaded || aarch64);

thanks
-- PMM

#2 lore raw
Quoted 11 lines · Peter Maydell
Quoted 6 lines · Jerome Forissier

This commit generates a random seed to be used by the secure OS for ASLR when the machine is secure. The seed is a 64-bit random value exported via the DT in /secure-chosen/kaslr-seed. This interface is used by OP-TEE [1].

[1] https://github.com/OP-TEE/optee_os/commit/ef262691fe0e

The kernel devicetree documentation documents this as a generic property of /chosen -- should we be providing a /chosen/kaslr-seed too ?

Quoted 16 lines

hw/arm/virt.c static void finalize_gic_version(VirtMachineState *vms) · line 1647

Quoted 11 lines

---

hw/arm/virt.c +9 -0
+static void create_secure_kaslr_seed(VirtMachineState *vms)
+{
+    Error *err = NULL;
+    uint64_t seed;
+
+    if (qcrypto_random_bytes(&seed, sizeof(seed), &err)) {
+        error_free(err);
+        return;
+    }

Since this is exposed to the guest I'm wondering if we should use qemu_guest_getrandom() (which lets you make the randomness deterministic for the benefit of record-and-replay). But I'm not sure if that function is usable before the guest has even started running. Pavel, could you answer that?

Yes, usage of deterministic functions is possible before machine is running,

because replay_configure is executed before machine initialization.

Quoted 25 lines

hw/arm/virt.c static void machvirt_init(MachineState *machine) · line 1853

Quoted 12 lines
hw/arm/virt.c +4 -0
+    qemu_fdt_setprop_u64(vms->fdt, "/secure-chosen", "kaslr-seed", seed);
+}
+
  static void machvirt_init(MachineState *machine)
  {
      VirtMachineState *vms = VIRT_MACHINE(machine);
@@ -1837,6 +1850,7 @@ static void machvirt_init(MachineState *machine)
      if (vms->secure) {
          create_secure_ram(vms, secure_sysmem);
          create_uart(vms, VIRT_SECURE_UART, secure_sysmem, serial_hd(1));
+        create_secure_kaslr_seed(vms);

This is implicitly relying on create_uart() having created the "/secure-chosen" node. I think it would be better now that we have multiple things we might want to put there if we just pulled the "create /secure-chosen" code out to the create_fdt() function so we do it at the same place we create "/chosen". (You can do that as a simple patch of its own that comes before this one in the patchseries.)

hw/arm/virt.c static void machvirt_init(MachineState *machine) · line 1856

Quoted 3 lines
hw/arm/virt.c +0 -0
      }
 
      vms->highmem_ecam &= vms->highmem && (!firmware_loaded || aarch64);

thanks
-- PMM

#3 lore raw
Quoted 31 lines · Pavel Dovgalyuk
Quoted 11 lines · Peter Maydell
Quoted 6 lines · Jerome Forissier

This commit generates a random seed to be used by the secure OS for ASLR when the machine is secure. The seed is a 64-bit random value exported via the DT in /secure-chosen/kaslr-seed. This interface is used by OP-TEE [1].

[1] https://github.com/OP-TEE/optee_os/commit/ef262691fe0e

The kernel devicetree documentation documents this as a generic property of /chosen -- should we be providing a /chosen/kaslr-seed too ?

Quoted 16 lines

hw/arm/virt.c static void finalize_gic_version(VirtMachineState *vms) · line 1647

Quoted 11 lines

---

hw/arm/virt.c +9 -0
+static void create_secure_kaslr_seed(VirtMachineState *vms)
+{
+    Error *err = NULL;
+    uint64_t seed;
+
+    if (qcrypto_random_bytes(&seed, sizeof(seed), &err)) {
+        error_free(err);
+        return;
+    }

Since this is exposed to the guest I'm wondering if we should use qemu_guest_getrandom() (which lets you make the randomness deterministic for the benefit of record-and-replay). But I'm not sure if that function is usable before the guest has even started running. Pavel, could you answer that?

Quoted 3 lines

Yes, usage of deterministic functions is possible before machine is running,

because replay_configure is executed before machine initialization.

Great, thanks. Sonuds like we should use qemu_guest_getrandom() then.

-- PMM