From nobody Mon Feb 9 09:08:32 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1586538145; cv=none; d=zohomail.com; s=zohoarc; b=bmI0InDRDussbe7m3aVoxSUdfdxDcxgx85XrT/dh0OoojnzjV0/Hi3jHWPRI0WE0tM52RMNiUgr/fZMJY+bcgQ5XjsFDmMaC14IMYBjaeYUkv3AUhJbFbY9oY8x53kv0c2IgvvkxJndmMnlDRSGK21uGCwmJrfQCV9JNVhzfvAY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1586538145; h=Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=pePTeeE7h5ir7BgZLzcfutrSaXBXb4kdz/GFrYkYkbA=; b=I+LzR/9nhNXJWeuZiC+fWSSLvKOzo8Sft3tzTvKO0bOcnLS8AQ1RhdI6ayPKCqCtr91sk4iWM3JfzYpFAwGgSXOXJ4UJV8iNVPr3jsjOyJyzX/Kchdbu7zXVcjqVXxyUaUFbDBAz4E1R8lDUMg3KD1Ln+CCjVFiehh0lqE+i1QM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1586538145123102.08371662097738; Fri, 10 Apr 2020 10:02:25 -0700 (PDT) Received: from localhost ([::1]:37114 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jMx2t-0001XL-6c for importer@patchew.org; Fri, 10 Apr 2020 13:02:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59180) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jMvkb-00056S-W9 for qemu-devel@nongnu.org; Fri, 10 Apr 2020 11:39:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jMvka-0003G9-Pv for qemu-devel@nongnu.org; Fri, 10 Apr 2020 11:39:25 -0400 Received: from mail-wm1-x342.google.com ([2a00:1450:4864:20::342]:38446) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jMvka-0003Fb-EH for qemu-devel@nongnu.org; Fri, 10 Apr 2020 11:39:24 -0400 Received: by mail-wm1-x342.google.com with SMTP id f20so3094954wmh.3 for ; Fri, 10 Apr 2020 08:39:24 -0700 (PDT) Received: from matebook.home ([2a01:e0a:3cb:7bb0:f902:b48c:6f87:25f2]) by smtp.gmail.com with ESMTPSA id k184sm3271699wmf.9.2020.04.10.08.39.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 10 Apr 2020 08:39:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=forissier-org.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=pePTeeE7h5ir7BgZLzcfutrSaXBXb4kdz/GFrYkYkbA=; b=VHqznM834Q3FGNoDrCU5swGI2/sM2m1H/BjRJmuH27SgGDgZE2jfTpJpjfJ9yVxSUd 8afJlWJ4/ppMd1rIM27IyDUdr0TGe/m3Yvu6bQchHLJ6QbrxMQdU8G0MIdCUQ1h8iujX n76dyg0r8Ca9SVYzdJ8qWU2fLN+iN2unml4bLReuQZhgzVXkCEJqExeyJlIyhfpCSOXS tkzVVRnCdAemhpBgy93pAlexTUHiYjPgYv4akk16hnEd0xx6Q5MAmXsC+sXmST5+uO1l tci+8uHZs3xtt6HJtCCl3wrsW3y1mvOVaXycsn/6v3adczdnZGq5vqMvzwSXAwnwzDaK 7AqA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=pePTeeE7h5ir7BgZLzcfutrSaXBXb4kdz/GFrYkYkbA=; b=pV7gnKGodda21pY7rz4Q/BSrK0lT/rtahakumm+J8jOJuQdfkchcG14UbZzi0bA9Dc p3Yof+oCKdmB0qEHmVe+VNbMUX40oxboSD+D+TB7VX+N13BSHnVy56v5i5aTGnE/huB5 y45zHpne/MQux++7paVwF9C/Ng/ehHZ3scHadmVrKEHpZRPUI7m4KU8bvhwU1TLZjEFl 1QMRozaxMSrn2tB7cz2GWK3bSxVe1ftQh2AUk+qDXECOVk/jqecdruO7bbkc8xymvLZA lILEUqcopi2WsPDP2E6z31XOVQL85Jl9ksp4Tgty1OOwVnGbS1G2BLiXRkNy+S07ICUb SmZw== X-Gm-Message-State: AGi0PuacQRKd94ySYMgQr7yjzQGidvEp7RgPbTDle4WSF9mZvRxE1f2J cSiFkKHlrEmzSYnnBgIct9Nk6XGH3/1wLQ== X-Google-Smtp-Source: APiQypLlsugc8ej+el5zmekUPIP2QIPzriNKWb60AGoNgQus0cZtKMg/NsnknmpmfAjJ7eRQjSxoYg== X-Received: by 2002:a1c:dfc2:: with SMTP id w185mr5462853wmg.1.1586533162428; Fri, 10 Apr 2020 08:39:22 -0700 (PDT) From: Jerome Forissier To: qemu-devel@nongnu.org Subject: [PATCH] hw/arm/virt: Add DT property /secure-chosen/kaslr-seed Date: Fri, 10 Apr 2020 17:39:16 +0200 Message-Id: <20200410153916.17718-1-jerome@forissier.org> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::342 X-Mailman-Approved-At: Fri, 10 Apr 2020 13:01:30 -0400 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Jerome Forissier , Jens Wiklander Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" 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 Signed-off-by: Jerome Forissier --- hw/arm/virt.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/hw/arm/virt.c b/hw/arm/virt.c index 7dc96abf72c..42a6f84086f 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -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" =20 #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 *v= ms) } } =20 +static void create_secure_kaslr_seed(VirtMachineState *vms) +{ + Error *err =3D 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 =3D 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); } =20 vms->highmem_ecam &=3D vms->highmem && (!firmware_loaded || aarch64); --=20 2.20.1