From patchwork Fri Aug 23 06:24:52 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hsin-Yi Wang X-Patchwork-Id: 11110641 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id D956F13A4 for ; Fri, 23 Aug 2019 06:28:30 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 9F7AA206BA for ; Fri, 23 Aug 2019 06:28:30 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="PQVzH9Pc"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="PhwssDkl" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9F7AA206BA Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=chromium.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=CIz/O34kOU/BmnDg1Y1AjKfoqQt627QW9RqolWuVcnI=; b=PQVzH9Pc8O35ak FGfDnyjrNWEHSQ04YTA/nWmU2fxVuCTVZB0kvHMEcC8z/YY4wz2bVrsSUdRL2cANDR1KWwRWrNd4R yz9Nl+d0Blbnm3eZrTZt/SBJduYf2AH59Y9M78yWGGlgzTautnfHG7zDMI6j69KEyrYYZ0hYeREiP ikNgn9Ec1xJxDKLsS2mtqosZGExIS3KMICHuqmfcv1VSPbb8BiFS6LC0/dR2x8lR1p2LRFCWDN2l9 vUMs+JDPA3wFqOcDz4rnlLaWGBtBOEibHFappsUWowM8OO11drDGdxyX0mgnl9Y7asmh1rAojFqjv h/6tnngDq7Ga+QBq8z+Q==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92 #3 (Red Hat Linux)) id 1i133l-0003Jq-W8; Fri, 23 Aug 2019 06:28:30 +0000 Received: from mail-pl1-x643.google.com ([2607:f8b0:4864:20::643]) by bombadil.infradead.org with esmtps (Exim 4.92 #3 (Red Hat Linux)) id 1i1330-0002Z7-G8 for linux-arm-kernel@lists.infradead.org; Fri, 23 Aug 2019 06:27:44 +0000 Received: by mail-pl1-x643.google.com with SMTP id w11so4519525plp.5 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=DYU/VdYmSPsK3n7ARAU0JTOMgBlBqizOr4BmrUvZKjmZsNOtwHjWQVyvoIyQ5jO2E6 3FG843gO4P609vR90L3ckuxhRadOS8JFwTxD//YPZr5JA0NbAyZ8m4AWptXBJVwUBh0P EmY/RdkdvAsonUhtMBZdozq5CdvPj9bWUI909VpRSgJjf3xT0LTUqFoDSw1fYNHgtfz0 5ID6491J29aoLiXQkcRFGSpJQuA0guQpVSfdQPp1gnjuPlabGzvKOpbUCrtaqY6rUJe9 /F1os7AAjisNFwNcIb8AwNlgM4dJiLeVGVhFtPFFTvnF3Nnn+45Gj0os3RM8Ca5tpc8H mC+g== X-Gm-Message-State: APjAAAWQzcbLHZKwazSuT4zhtlLk3dXeCAatTXY+RhCl1+LVeOqh7Og6 JIvD3c3ULjaD6IQ3qbatRJmhqzDT/ZE= 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" 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 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190822_232742_683095_5892D242 X-CRM114-Status: GOOD ( 15.48 ) X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.2 on bombadil.infradead.org summary: Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2607:f8b0:4864:20:0:0:0:643 listed in] [list.dnswl.org] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.0 DKIMWL_WL_HIGH DKIMwl.org - Whitelisted High sender X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kate Stewart , Peter Zijlstra , Catalin Marinas , Mukesh Ojha , Grzegorz Halat , "H . Peter Anvin" , Guenter Roeck , Will Deacon , Marek Szyprowski , Rob Herring , Daniel Thompson , Anders Roxell , Yury Norov , Marc Zyngier , Russell King , Aaro Koskinen , Ingo Molnar , Viresh Kumar , Waiman Long , "Paul E . McKenney" , Wei Li , Alexey Dobriyan , Julien Thierry , Len Brown , Kees Cook , Arnd Bergmann , Rik van Riel , Stephen Boyd , Shaokun Zhang , Mike Rapoport , Borislav Petkov , Josh Poimboeuf , Thomas Gleixner , Greg Kroah-Hartman , Marcelo Tosatti , linux-kernel@vger.kernel.org, Armijn Hemel , Jiri Kosina , Mathieu Desnoyers , Andrew Morton , Tim Chen , "David S . Miller" Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.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