From patchwork Tue May 14 19:16:43 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 164242 Delivered-To: patch@linaro.org Received: by 2002:a92:9e1a:0:0:0:0:0 with SMTP id q26csp3010413ili; Tue, 14 May 2019 12:29:15 -0700 (PDT) X-Google-Smtp-Source: APXvYqzjp2loDehF0fvLBoYQeJeY3r2iBGlNftr+E2dL54WFVWYIkN9JE0KNV0Ve7w/+yGIYNQNK X-Received: by 2002:a50:9025:: with SMTP id b34mr38608387eda.145.1557862155477; Tue, 14 May 2019 12:29:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1557862155; cv=none; d=google.com; s=arc-20160816; b=lWxPc4QshCBf0kd4PfMFXHOvA3vqfYYiBsE3wWAWyQIjWyPDyvpZq0HvG0uDK2Im2g cawUGk+45U/SYXV/qrisDEydw8s0jrSkueK9ic81nXEJQSQTuGSi1AdBbOPUP0fRcN8b fWzWLU6Cj938/KkBR6D72+LQLrfuXxbqnIwWCPmpY0YTglOJ3SAMnZUloVYsEIxbGV5n GP5nGEfDJiCDHkQmPXTjDaRiMk48tJL1h1+EMp61ngm569Jwrkiq3rR19vGcDt9+Akdl eSwRLh3ZR7vMeilBOlPgS1W3Ghe8WXMhXgmUoPfn2ad6gJ8Gf6eh59J7ZhibiGF2dFC5 9QSg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=yE70JIuqrA6MJdI0/JWiVeD/16stq6LybzVtzKfjj1Q=; b=Wb1V42MgrxOwNVnT7mRjhbYZlSH8tho2DQF9CzGPGpU74KX2DYOxMzvA3B7JDYTytE iuh+Jg8XLLpt8EufHI9BQslz8sgfl/IBoTIIRAusMIfnergMit2IZuCS9JOFgQQLx3FC 7G89iAyr/Uiu9Ur2KFoWFgv/MZpnO8wBVWJ/rnUN5mCkZk14GCYQoOGtKlasnMMMtFlS sQc/8RXHUjymWqIpE/3u+LF5s1RLLXaJR//Oxi4Tm/Ib1kQifiseqIxEJtoyEZ7V45BZ Mm42VGMqqMUlBPdYH7Bss8mx1yAvKy5Mczlv03zT6rt62woshztIJeYa/acHumRF0LfG CoCg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=HAhj2AFc; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id i41si2949815ede.444.2019.05.14.12.29.15 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 14 May 2019 12:29:15 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=HAhj2AFc; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([127.0.0.1]:53072 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hQd6w-0004O2-8U for patch@linaro.org; Tue, 14 May 2019 15:29:14 -0400 Received: from eggs.gnu.org ([209.51.188.92]:48892) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hQcvM-0002aW-MR for qemu-devel@nongnu.org; Tue, 14 May 2019 15:17:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hQcvL-0006wn-Iu for qemu-devel@nongnu.org; Tue, 14 May 2019 15:17:16 -0400 Received: from mail-pf1-x430.google.com ([2607:f8b0:4864:20::430]:46460) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hQcvL-0006w7-Cn for qemu-devel@nongnu.org; Tue, 14 May 2019 15:17:15 -0400 Received: by mail-pf1-x430.google.com with SMTP id y11so9608580pfm.13 for ; Tue, 14 May 2019 12:17:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=yE70JIuqrA6MJdI0/JWiVeD/16stq6LybzVtzKfjj1Q=; b=HAhj2AFcpUh4CzjBMsth/rz20YO6pgjhOkyg67ZMHAaUsCX/VlgNg8rJIOiRbwCdly DS5OZDF1vbWEvJQqapt4FwWTSXWok0p8b7K0qua9AryIAx932itK4y+oDQLspLb/5TVt stVUUWSKNufesu5j7h0fqTw4s7X/nguPDL3O9YqtVgGaqWi1ahmhO7lZyDPuqvi8cds9 38uqdrQJX1zgdlndtVHrlEegF5I0G0x3WHTt6MNXfWpLx1Yua55uXkvW+s7Pfe5hA0wE eM3V4rxguAL7vs9gdazmuPBu4qDqMNitb9NBT//PfpcJS4ygKC8pceHg2IJotdzSFVis PndQ== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=yE70JIuqrA6MJdI0/JWiVeD/16stq6LybzVtzKfjj1Q=; b=CcFCfZkMhfopte756FvuEdTWcMfjW/V9IdKYx6UKc/FbAggqVEic3Keo9xu6AwvvOs oB739TxJ8hxxnOd/l7ogMPfObDaM6HOtWOjLdT1UYEFTCYNI/czrShrXAHyBy0/oDqN0 CR/10nit9vxQ8ekWIKO9xJA4ULNwfjdT24XE6KoSXlL1JoTdIU2xlAxrVJyMKjUbE7/d G8OpAozREARB9F05MbnXZ66fZslP4RVGHB1Jq9/OVDiMGMzcxSbyRxjdTAfXi4n3ImnX 55fD5/Hafrgq+RQxw6a6R31OScJq2Ish9IQf6CcZS0lS6k/HbBfJDYqj4zYoRi4J+3zb 1dug== X-Gm-Message-State: APjAAAVh9x4GFmfrTxvoQYc32ZLo1oVN0WCChFk7WHN+RoYsTFKPFUW+ DZUarAn5PF9BlnMqyZ+OuT+8ChAW7lc= X-Received: by 2002:a63:6b06:: with SMTP id g6mr28570506pgc.346.1557861434077; Tue, 14 May 2019 12:17:14 -0700 (PDT) Received: from localhost.localdomain (97-113-13-231.tukw.qwest.net. [97.113.13.231]) by smtp.gmail.com with ESMTPSA id o6sm18682982pfa.88.2019.05.14.12.17.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 14 May 2019 12:17:13 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Tue, 14 May 2019 12:16:43 -0700 Message-Id: <20190514191653.31488-15-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190514191653.31488-1-richard.henderson@linaro.org> References: <20190514191653.31488-1-richard.henderson@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::430 Subject: [Qemu-devel] [PATCH v7 14/24] linux-user/aarch64: Use qemu_guest_getrandom for PAUTH keys X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: lvivier@redhat.com, berrange@redhat.com, armbru@redhat.com Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Use a better interface for random numbers than rand() * 3. Reviewed-by: Laurent Vivier Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Richard Henderson --- linux-user/aarch64/target_syscall.h | 2 -- linux-user/aarch64/cpu_loop.c | 29 ++++++--------------------- linux-user/syscall.c | 31 ++++++++++++++++++++++++----- 3 files changed, 32 insertions(+), 30 deletions(-) -- 2.17.1 diff --git a/linux-user/aarch64/target_syscall.h b/linux-user/aarch64/target_syscall.h index b595e5da82..995e475c73 100644 --- a/linux-user/aarch64/target_syscall.h +++ b/linux-user/aarch64/target_syscall.h @@ -29,6 +29,4 @@ struct target_pt_regs { # define TARGET_PR_PAC_APDBKEY (1 << 3) # define TARGET_PR_PAC_APGAKEY (1 << 4) -void arm_init_pauth_key(ARMPACKey *key); - #endif /* AARCH64_TARGET_SYSCALL_H */ diff --git a/linux-user/aarch64/cpu_loop.c b/linux-user/aarch64/cpu_loop.c index d75fd9d3e2..cedad39ca0 100644 --- a/linux-user/aarch64/cpu_loop.c +++ b/linux-user/aarch64/cpu_loop.c @@ -20,6 +20,7 @@ #include "qemu/osdep.h" #include "qemu.h" #include "cpu_loop-common.h" +#include "qemu/guest-random.h" #define get_user_code_u32(x, gaddr, env) \ ({ abi_long __r = get_user_u32((x), (gaddr)); \ @@ -147,24 +148,6 @@ void cpu_loop(CPUARMState *env) } } -static uint64_t arm_rand64(void) -{ - int shift = 64 - clz64(RAND_MAX); - int i, n = 64 / shift + (64 % shift != 0); - uint64_t ret = 0; - - for (i = 0; i < n; i++) { - ret = (ret << shift) | rand(); - } - return ret; -} - -void arm_init_pauth_key(ARMPACKey *key) -{ - key->lo = arm_rand64(); - key->hi = arm_rand64(); -} - void target_cpu_copy_regs(CPUArchState *env, struct target_pt_regs *regs) { ARMCPU *cpu = arm_env_get_cpu(env); @@ -192,11 +175,11 @@ void target_cpu_copy_regs(CPUArchState *env, struct target_pt_regs *regs) #endif if (cpu_isar_feature(aa64_pauth, cpu)) { - arm_init_pauth_key(&env->apia_key); - arm_init_pauth_key(&env->apib_key); - arm_init_pauth_key(&env->apda_key); - arm_init_pauth_key(&env->apdb_key); - arm_init_pauth_key(&env->apga_key); + qemu_guest_getrandom_nofail(&env->apia_key, sizeof(ARMPACKey)); + qemu_guest_getrandom_nofail(&env->apib_key, sizeof(ARMPACKey)); + qemu_guest_getrandom_nofail(&env->apda_key, sizeof(ARMPACKey)); + qemu_guest_getrandom_nofail(&env->apdb_key, sizeof(ARMPACKey)); + qemu_guest_getrandom_nofail(&env->apga_key, sizeof(ARMPACKey)); } ts->stack_base = info->start_stack; diff --git a/linux-user/syscall.c b/linux-user/syscall.c index 96f20886ce..8c17b14d51 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -108,6 +108,7 @@ #include "qemu.h" #include "qemu/guest-random.h" +#include "qapi/error.h" #include "fd-trans.h" #ifndef CLONE_IO @@ -9765,25 +9766,45 @@ static abi_long do_syscall1(void *cpu_env, int num, abi_long arg1, int all = (TARGET_PR_PAC_APIAKEY | TARGET_PR_PAC_APIBKEY | TARGET_PR_PAC_APDAKEY | TARGET_PR_PAC_APDBKEY | TARGET_PR_PAC_APGAKEY); + int ret = 0; + Error *err = NULL; + if (arg2 == 0) { arg2 = all; } else if (arg2 & ~all) { return -TARGET_EINVAL; } if (arg2 & TARGET_PR_PAC_APIAKEY) { - arm_init_pauth_key(&env->apia_key); + ret |= qemu_guest_getrandom(&env->apia_key, + sizeof(ARMPACKey), &err); } if (arg2 & TARGET_PR_PAC_APIBKEY) { - arm_init_pauth_key(&env->apib_key); + ret |= qemu_guest_getrandom(&env->apib_key, + sizeof(ARMPACKey), &err); } if (arg2 & TARGET_PR_PAC_APDAKEY) { - arm_init_pauth_key(&env->apda_key); + ret |= qemu_guest_getrandom(&env->apda_key, + sizeof(ARMPACKey), &err); } if (arg2 & TARGET_PR_PAC_APDBKEY) { - arm_init_pauth_key(&env->apdb_key); + ret |= qemu_guest_getrandom(&env->apdb_key, + sizeof(ARMPACKey), &err); } if (arg2 & TARGET_PR_PAC_APGAKEY) { - arm_init_pauth_key(&env->apga_key); + ret |= qemu_guest_getrandom(&env->apga_key, + sizeof(ARMPACKey), &err); + } + if (ret != 0) { + /* + * Some unknown failure in the crypto. The best + * we can do is log it and fail the syscall. + * The real syscall cannot fail this way. + */ + qemu_log_mask(LOG_UNIMP, + "PR_PAC_RESET_KEYS: Crypto failure: %s", + error_get_pretty(err)); + error_free(err); + return -TARGET_EIO; } return 0; }