From patchwork Wed May 22 18:42:16 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 164874 Delivered-To: patch@linaro.org Received: by 2002:a92:9e1a:0:0:0:0:0 with SMTP id q26csp1243987ili; Wed, 22 May 2019 12:18:17 -0700 (PDT) X-Google-Smtp-Source: APXvYqz+4nus1l0SZsJZAXsFvTxUbT55GOmRAaDce4+d0rVqzI+L0rmy9wmRDH4X+jDdZ1Wgf4X6 X-Received: by 2002:a50:b56a:: with SMTP id z39mr91987240edd.91.1558552697018; Wed, 22 May 2019 12:18:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1558552697; cv=none; d=google.com; s=arc-20160816; b=P4PZPIWY7w8I7NgmFxfXwJMKqC7LTPP5i4k88nrXvi8MiBQ3Q2cM6q/udrIWfrhYyf jva3oAY28VpgYXvxf9sSJ3bIUfxuaMomLIks/lTm3LsOxTZHG8FzqxFKOqeEL7Xf4wmb +BzDLJQu53bQx7K5GnviHTqX/Hi482Ddrfkv254jGsQtf/Jt0p6JX3KlFtBoq3A/4o48 HY1tl2fWrVGXKfW/xYhPvOlKRQkGfgY8fLi2L2c3NAsvH0z1zEZDWqr6EmE7yY/q9ITp 9dOjEDceCxowiJbu9C6iJGfGASONcy5cVzNkLJVz4wbUt2NjpwGKQcFvablygvJbLueE fkGQ== 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=e2SNlmxHFtsdM0b0itsXkBL9sAk67p5UPbLq4CDfjKQ=; b=B9PFjWbTEBidsbLPDZGWtTrOCpy1UYJ//fvmvSC48fFkY/dRgdxCLNPJPuwZGDy6FI juUazvwTZktwj+7RBhoLw3msJj3uc4D9OsgCIs7px4AobU5mJd2kWLZC9/dvIguIoP4q McGKSvg4CfcKcdYkpH8uYDqvFLqdgY1m8BGOXtYlKIDD4JtL4qCp8hIPWi4JdUjl56Bz GX4aXq5xqCBvxijfk8Ib1r2e+iU1TsqeuYF+PgvgVBaQz//w+iKlH6BnYpRe5hx4n2yA zUySQI74EFIFh70O78WdbJO4fx/AD6tZX/YHZ1YuE+Hd/C6yCq/wDvJX2Jy9r/UPcehD G2QA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=nAmWZDxB; 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 s53si6691800eda.46.2019.05.22.12.18.16 for (version=TLS1 cipher=AES128-SHA bits=128/128); Wed, 22 May 2019 12:18:17 -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=nAmWZDxB; 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]:49967 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hTWkh-0003bJ-S5 for patch@linaro.org; Wed, 22 May 2019 15:18:15 -0400 Received: from eggs.gnu.org ([209.51.188.92]:34796) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hTWOo-00086f-DR for qemu-devel@nongnu.org; Wed, 22 May 2019 14:55:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hTWCN-00089H-SX for qemu-devel@nongnu.org; Wed, 22 May 2019 14:42:49 -0400 Received: from mail-yw1-xc43.google.com ([2607:f8b0:4864:20::c43]:46556) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hTWCN-00087Q-26 for qemu-devel@nongnu.org; Wed, 22 May 2019 14:42:47 -0400 Received: by mail-yw1-xc43.google.com with SMTP id a130so1226205ywe.13 for ; Wed, 22 May 2019 11:42:45 -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=e2SNlmxHFtsdM0b0itsXkBL9sAk67p5UPbLq4CDfjKQ=; b=nAmWZDxBw1LBKfn1t5DLJXcQyC1eJezA6t27t6jn6XshhMWmiUp9BUU/7eG8JDku6h AUk4ejyCNobPPEgPhuNIALlf8Arf9CS+DLsTB+JlCZEqeFbZu7V2zj6OzvEujqeFsbHU 5nr5lxRPYIdSSCHEs8wsNEwUn7V2bq/vrTf2SjmDxGubRnsTbBrovjCtBOjcDjtlK0ZP HZ/ve94BmBU3Vo+oyOv9bo+IO5gBNh8YsrnZUXyir6qWc58snKQCNseAH+AFBZP64vRI wLb9pdGUaisrCP2y8w9z9772GtZHZaUbou2L9Ywc18np6jHXdKg0ebOmTa6SLz6WPz2w Ps3A== 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=e2SNlmxHFtsdM0b0itsXkBL9sAk67p5UPbLq4CDfjKQ=; b=pmZ7AXyvcm55p9Msyf4SxrsO/TmO812eahAjaC9KON0tXt3iMRygu2Hu7SeWsfXfem ZBulJ0nLaaeooKcZs3RZ6nFdVu/XfdWz9xk+QzvdQQeeE/cTfmJ+tGhET20OY1VsuTGo EiiGX9f5iCa12/2vaqj3vb7Y1p/+S4gAdqVLs6fRPrXhR8FmDugWkbBUnNsr/ITIMCrZ Q/Iqb75evHR7UmhDlvANto8mzYVyGIF+QEc7/ifOtTH9elXChWbh8kyziim6Aaudqp8n qQ0OVcMGxuPy86OighrIg7Cl0KFF49rxPxDzztJ4CO7QLWBYJ41SEClfmIM2PPVWyihu 6J4Q== X-Gm-Message-State: APjAAAWtWvcNCT8vjj4nGAgplCq5qxh6ObX561lrBbxUwuY2apY2maLb oAA4fEccUToaTRxRq1tOP2yw6pxvh1Y= X-Received: by 2002:a81:6a03:: with SMTP id f3mr28238704ywc.169.1558550564394; Wed, 22 May 2019 11:42:44 -0700 (PDT) Received: from localhost.localdomain ([71.46.56.17]) by smtp.gmail.com with ESMTPSA id 206sm1299445ywq.74.2019.05.22.11.42.43 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 22 May 2019 11:42:43 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Wed, 22 May 2019 14:42:16 -0400 Message-Id: <20190522184226.17871-16-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190522184226.17871-1-richard.henderson@linaro.org> References: <20190522184226.17871-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::c43 Subject: [Qemu-devel] [PULL 15/25] 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: peter.maydell@linaro.org 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 f3ea9cac21..72e43b517a 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; }