From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.9 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E4EA3C3A5A2 for ; Fri, 23 Aug 2019 06:27:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id AF39F21019 for ; Fri, 23 Aug 2019 06:27:45 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="PhwssDkl" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728332AbfHWG1o (ORCPT ); Fri, 23 Aug 2019 02:27:44 -0400 Received: from mail-pl1-f195.google.com ([209.85.214.195]:46059 "EHLO mail-pl1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731346AbfHWG1m (ORCPT ); Fri, 23 Aug 2019 02:27:42 -0400 Received: by mail-pl1-f195.google.com with SMTP id y8so4983756plr.12 for ; Thu, 22 Aug 2019 23:27:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Kb0kqD1qhyP3JWsvYXGZaOdpUgrW0FO979UbW1Fs5iA=; b=PhwssDkl7Y7jDDT/G4EwxHxtS6Hwww3jOrLJzmhAMy4og3YXDKwNL8APxYsP2XBL5i +c+GQeAthDApB/ypQSegIIKFiuc2WCHlpiVoAZ/4pp02r2MTphJvBYLE56bgJtzUnfj4 F8aHbHSuvVlFQp2GeDu1fOz0dCXGRI5u4zf7U= 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=Kb0kqD1qhyP3JWsvYXGZaOdpUgrW0FO979UbW1Fs5iA=; b=PY+7NL3IbhLc8rgmKtLnVqoaUTAhQ0O71laAqPLif07/GfH5W9snI8wgjHspXQPEXM Lm5+LmCor32TYVbaG7f+p4cMp47mp7GoFnaArgFjCBHzGoKDh4ESNYBERdQCteH2pRCB 1D3t4iCyPayi3v2spqE+A1rBOBVlSVEaLwivBU/dyAfOPhJLYf1HWD+xyNn9rPm51hWN hXmAmf6+/zMFvgxI3GPcBuvXBu/myqnNgBhM8f4LSALuaIHRuGYlI74oBdKHJ71g4m/K LpJ/yT9hiQY97SvrG8mczuyEHZ99PwzH1L0/GHiuPwtGxc5jDtdqKEPs5Rk0lyxqAAKh EzOQ== X-Gm-Message-State: APjAAAXBC7O0agAy62asul9qvByo+moTES87pp0YmkHJ8WE6gFNRtCKb FkqXVX/gqwZSGtLGm7d7OJNN0w== X-Google-Smtp-Source: APXvYqx+zIgHFtGZH2QgUnrJeYCDf1BjoDBgZXNPumUmqhYMd5HWMViEsafTartyaLR5Je6tf/TcQw== X-Received: by 2002:a17:902:d684:: with SMTP id v4mr2988291ply.238.1566541661720; Thu, 22 Aug 2019 23:27:41 -0700 (PDT) Received: from hsinyi-z840.tpe.corp.google.com ([2401:fa00:1:10:b852:bd51:9305:4261]) by smtp.gmail.com with ESMTPSA id q13sm2139671pfl.124.2019.08.22.23.27.35 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 22 Aug 2019 23:27:41 -0700 (PDT) From: Hsin-Yi Wang To: linux-arm-kernel@lists.infradead.org, "Theodore Y . Ts'o" Cc: Russell King , Catalin Marinas , Will Deacon , Thomas Gleixner , Ingo Molnar , Borislav Petkov , "H . Peter Anvin" , "Paul E . McKenney" , Kate Stewart , "David S . Miller" , Viresh Kumar , Marek Szyprowski , Arnd Bergmann , Marc Zyngier , Julien Thierry , Greg Kroah-Hartman , Wei Li , Anders Roxell , Rob Herring , Aaro Koskinen , Daniel Thompson , Tim Chen , Rik van Riel , Waiman Long , Marcelo Tosatti , Peter Zijlstra , Armijn Hemel , Grzegorz Halat , Len Brown , Shaokun Zhang , Mike Rapoport , Kees Cook , Stephen Boyd , Guenter Roeck , Andrew Morton , Mathieu Desnoyers , Alexey Dobriyan , Yury Norov , Josh Poimboeuf , Jiri Kosina , Mukesh Ojha , linux-kernel@vger.kernel.org Subject: [PATCH v10 3/3] arm64: kexec_file: add rng-seed support Date: Fri, 23 Aug 2019 14:24:52 +0800 Message-Id: <20190823062452.127528-4-hsinyi@chromium.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190823062452.127528-1-hsinyi@chromium.org> References: <20190823062452.127528-1-hsinyi@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Adding "rng-seed" to dtb. It's fine to add this property if original fdt doesn't contain it. Since original seed will be wiped after read, so use a default size 128 bytes here. Signed-off-by: Hsin-Yi Wang Reviewed-by: Stephen Boyd --- No change since v7 --- arch/arm64/kernel/machine_kexec_file.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/arch/arm64/kernel/machine_kexec_file.c b/arch/arm64/kernel/machine_kexec_file.c index ba78ee7ca990..7b08bf9499b6 100644 --- a/arch/arm64/kernel/machine_kexec_file.c +++ b/arch/arm64/kernel/machine_kexec_file.c @@ -27,6 +27,8 @@ #define FDT_PROP_INITRD_END "linux,initrd-end" #define FDT_PROP_BOOTARGS "bootargs" #define FDT_PROP_KASLR_SEED "kaslr-seed" +#define FDT_PROP_RNG_SEED "rng-seed" +#define RNG_SEED_SIZE 128 const struct kexec_file_ops * const kexec_file_loaders[] = { &kexec_image_ops, @@ -102,6 +104,19 @@ static int setup_dtb(struct kimage *image, FDT_PROP_KASLR_SEED); } + /* add rng-seed */ + if (rng_is_initialized()) { + u8 rng_seed[RNG_SEED_SIZE]; + get_random_bytes(rng_seed, RNG_SEED_SIZE); + ret = fdt_setprop(dtb, off, FDT_PROP_RNG_SEED, rng_seed, + RNG_SEED_SIZE); + if (ret) + goto out; + } else { + pr_notice("RNG is not initialised: omitting \"%s\" property\n", + FDT_PROP_RNG_SEED); + } + out: if (ret) return (ret == -FDT_ERR_NOSPACE) ? -ENOMEM : -EINVAL; @@ -110,7 +125,8 @@ static int setup_dtb(struct kimage *image, } /* - * More space needed so that we can add initrd, bootargs and kaslr-seed. + * More space needed so that we can add initrd, bootargs, kaslr-seed, and + * rng-seed. */ #define DTB_EXTRA_SPACE 0x1000 -- 2.20.1