From patchwork Fri May 10 17:30:30 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 163912 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:142:0:0:0:0 with SMTP id j2csp2672790ilr; Fri, 10 May 2019 10:37:27 -0700 (PDT) X-Google-Smtp-Source: APXvYqxFEBgCEyK7EczlGPDZIjmdgJyCcdIpkGb1HKMPBmk6u7/SVpEamzWE7xsQgKxDmOoPqqh/ X-Received: by 2002:a17:906:4bda:: with SMTP id x26mr9805418ejv.176.1557509847114; Fri, 10 May 2019 10:37:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1557509847; cv=none; d=google.com; s=arc-20160816; b=q77AJFYF8RugbNalhL7DVnP0h7o5PoxriqnpSTNaNfchvnYLyabD4hA5fWlustHVnk zm1XjhEnbrhi4kiMcsFcbMeSmySBQj1Sd1JZGfL7kYakDUC2uX2RTRe2D1lzhz+y1Fub Wq2AFtszOmGMQDwvDinR8jqUSW7Hf7yuRvK1avIljfRUPzCkW/ukM33QvYUdlxl/8mHR oSEMAdTfsmOYuxizuhUMyo3zV/n0lWD/gluMlpaCrckaKMUpA7PrKZBa/CShiUoPpYJX 3e01rvIUSnMii6VRZdTDp7TQ/t7lgcTDsstFQiY/BuLZPzqd5kmcqX1RINNTFKdDlFGU rSKg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to: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=BFNXO+CSJUIyB4vBsJmwl02buO19GtyllxlmqyS+gn0=; b=d5o0vjDuq8NPhL2OyygFm6O+Cj/AaH4BTE9yKjYpLhFYShgHgLceykcHyVPdeQp1kD w9ZSQL0h9Xl9CRYuFYGi9Y9BQg4JlbrmAS5/Nf9lHmiELT4tlIATmcy/m6Y/PNZtgFjI 9Ez0lQ9wROOn+8kwZ3kBLNrFv+N8YBcb+Hbmy9UIDVjMrV9caAN9RvRQRu04bcp3S75B Bug9+wOurRq1RUYmD1rEIWUwa3WjhRfZKi4fz6gKiMChqjn6STNdatZhpJkQRoGgGpax QiHxwnKXEkPHUOYRm2E/WEJkfWa7Y3cZL4zuYhIM015agSl7fEPaRi3LEqVovHiKLH2L TcRw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=IhhRql27; 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 u2si3493077ejb.88.2019.05.10.10.37.26 for (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 10 May 2019 10:37:27 -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=IhhRql27; 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]:47558 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hP9SY-0004x0-0r for patch@linaro.org; Fri, 10 May 2019 13:37:26 -0400 Received: from eggs.gnu.org ([209.51.188.92]:59021) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hP9ML-0007ME-CP for qemu-devel@nongnu.org; Fri, 10 May 2019 13:31:02 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hP9MK-00061l-9d for qemu-devel@nongnu.org; Fri, 10 May 2019 13:31:01 -0400 Received: from mail-pf1-x442.google.com ([2607:f8b0:4864:20::442]:38800) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hP9MK-00061H-45 for qemu-devel@nongnu.org; Fri, 10 May 2019 13:31:00 -0400 Received: by mail-pf1-x442.google.com with SMTP id 10so3578648pfo.5 for ; Fri, 10 May 2019 10:30:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=BFNXO+CSJUIyB4vBsJmwl02buO19GtyllxlmqyS+gn0=; b=IhhRql27JRpyTpKfyfhwNCPUptOiFzoeD9+10SAJh5A95Z8lTymnQeV1bPsftIp2HX 8W5OABaR5iVrDav98FDzHRUFonVtXkDcs/DzwXGUlwSfjatxMbLH19Q4e9AwaeHYkiJN 5AUpHouyUc4aWTelIDU6Qls7BdriLu+jnH1MeebHhI+31YWvHEw5urjcv9bgYPc7i8a/ sFhlLK97oijZACujFMdj5i3yD3fDlv3Wn8W0JmnnWYds2NlSJK6DwPlZJU5BnvOk8wKR eUhhsBJE6ltRGp0mUpUXbbj+YyAOiOgKMxvMD3dFtqblmnlfyoAR6OuuUOtGkXl/+DPv ibEQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=BFNXO+CSJUIyB4vBsJmwl02buO19GtyllxlmqyS+gn0=; b=Rrdyw9tADA6qEDBznNNutpXTTUvVma9f4EnssaTdyLQyLXKq2Y4kAZJ9SiNfhaJNiX oYBY7fCzw/1NvvoKO/wI/7cXj5Liv6neNbnhuew+HwjKFyGDYlbmqOtiRqYmYKNus7TQ M6v5CAWYCniSneTCaK84HRL0Y5PhCtdbD7c+bxh/jk0bCbxfMEOSatwFrFfBAwI71t41 SVldv9PVkNQC3+Ka99k6p1DuLENAd4Wf/Qmi6dv61obrpYhp0M6Hck7O0UNOfsHPexKB HqhY0SByt8KBLOYN48vsc6+UvrbMQx5yphiqG/MUioMQrRHjZOHgvH85gjeTxFG2Q9F2 uc+A== X-Gm-Message-State: APjAAAU8f9X6AGOiK+1pxc2l3n2wQQxnc5Xxd5mtZEamIgR4/vwtsRff UjyuD1C+woUKv+2IYQey5r98zmUiQwc= X-Received: by 2002:aa7:8383:: with SMTP id u3mr15829769pfm.245.1557509458728; Fri, 10 May 2019 10:30:58 -0700 (PDT) Received: from localhost.localdomain (97-113-13-231.tukw.qwest.net. [97.113.13.231]) by smtp.gmail.com with ESMTPSA id v64sm7936792pfv.106.2019.05.10.10.30.57 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 10 May 2019 10:30:58 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Fri, 10 May 2019 10:30:30 -0700 Message-Id: <20190510173049.28171-7-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190510173049.28171-1-richard.henderson@linaro.org> References: <20190510173049.28171-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::442 Subject: [Qemu-devel] [PATCH v6 06/25] crypto: Use getrandom for qcrypto_random_bytes 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: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Prefer it to direct use of /dev/urandom. Reviewed-by: Laurent Vivier Reviewed-by: Daniel P. Berrangé Signed-off-by: Richard Henderson --- v3: If getrandom is not present, fall back on /dev/(u)random. --- crypto/random-platform.c | 37 ++++++++++++++++++++++++++++++++----- configure | 18 +++++++++++++++++- 2 files changed, 49 insertions(+), 6 deletions(-) -- 2.17.1 diff --git a/crypto/random-platform.c b/crypto/random-platform.c index 6df40744c7..cb3ca1bc09 100644 --- a/crypto/random-platform.c +++ b/crypto/random-platform.c @@ -27,7 +27,11 @@ #include static HCRYPTPROV hCryptProv; #else -static int fd; /* a file handle to either /dev/urandom or /dev/random */ +# ifdef CONFIG_GETRANDOM +# include +# endif +/* This is -1 for getrandom(), or a file handle for /dev/{u,}random. */ +static int fd; #endif int qcrypto_random_init(Error **errp) @@ -40,15 +44,20 @@ int qcrypto_random_init(Error **errp) return -1; } #else - /* TBD perhaps also add support for BSD getentropy / Linux - * getrandom syscalls directly */ +# ifdef CONFIG_GETRANDOM + if (getrandom(NULL, 0, 0) == 0) { + /* Use getrandom() */ + fd = -1; + return 0; + } + /* Fall through to /dev/urandom case. */ +# endif fd = open("/dev/urandom", O_RDONLY | O_CLOEXEC); if (fd == -1 && errno == ENOENT) { fd = open("/dev/random", O_RDONLY | O_CLOEXEC); } - if (fd < 0) { - error_setg(errp, "No /dev/urandom or /dev/random found"); + error_setg_errno(errp, errno, "No /dev/urandom or /dev/random"); return -1; } #endif @@ -66,6 +75,24 @@ int qcrypto_random_bytes(uint8_t *buf G_GNUC_UNUSED, return -1; } #else +# ifdef CONFIG_GETRANDOM + if (likely(fd < 0)) { + while (1) { + ssize_t got = getrandom(buf, buflen, 0); + if (likely(got == buflen)) { + return 0; + } + if (got >= 0) { + buflen -= got; + buf += got; + } else if (errno != EINTR) { + error_setg_errno(errp, errno, "getrandom"); + return -1; + } + } + } + /* Fall through to /dev/urandom case. */ +# endif while (1) { ssize_t got = read(fd, buf, buflen); if (likely(got == buflen)) { diff --git a/configure b/configure index 68b34a93eb..346f89ea6c 100755 --- a/configure +++ b/configure @@ -5815,6 +5815,20 @@ if compile_prog "" "" ; then have_utmpx=yes fi +########################################## +# check for getrandom() + +have_getrandom=no +cat > $TMPC << EOF +#include +int main(void) { + return getrandom(0, 0, GRND_NONBLOCK); +} +EOF +if compile_prog "" "" ; then + have_getrandom=yes +fi + ########################################## # checks for sanitizers @@ -7202,7 +7216,9 @@ fi if test "$have_utmpx" = "yes" ; then echo "HAVE_UTMPX=y" >> $config_host_mak fi - +if test "$have_getrandom" = "yes" ; then + echo "CONFIG_GETRANDOM=y" >> $config_host_mak +fi if test "$ivshmem" = "yes" ; then echo "CONFIG_IVSHMEM=y" >> $config_host_mak fi