From: Nicolas Boichat <drinkcat@chromium.org>
To: Hsin-Yi Wang <hsinyi@chromium.org>
Cc: linux-arm Mailing List <linux-arm-kernel@lists.infradead.org>,
Rob Herring <robh+dt@kernel.org>,
devicetree@vger.kernel.org, lkml <linux-kernel@vger.kernel.org>,
Frank Rowand <frowand.list@gmail.com>,
Catalin Marinas <catalin.marinas@arm.com>,
Will Deacon <will.deacon@arm.com>,
Andrew Morton <akpm@linux-foundation.org>,
Mike Rapoport <rppt@linux.ibm.com>,
Ard Biesheuvel <ard.biesheuvel@linaro.org>,
Miles Chen <miles.chen@mediatek.com>,
James Morse <james.morse@arm.com>,
Andrew Murray <andrew.murray@arm.com>,
Mark Rutland <mark.rutland@arm.com>,
Jun Yao <yaojun8558363@gmail.com>, Yu Zhao <yuzhao@google.com>,
Robin Murphy <robin.murphy@arm.com>,
Laura Abbott <labbott@redhat.com>,
Stephen Boyd <swboyd@chromium.org>,
Kees Cook <keescook@chromium.org>
Subject: Re: [PATCH v4 2/3] fdt: add support for rng-seed
Date: Mon, 20 May 2019 07:54:47 +0800 [thread overview]
Message-ID: <CANMq1KB7sh=UXaM4sMm_THjZ_wV3Thgr6_ona-TJFqA2QQHALA@mail.gmail.com> (raw)
In-Reply-To: <20190519160446.320-2-hsinyi@chromium.org>
On Mon, May 20, 2019 at 1:09 AM Hsin-Yi Wang <hsinyi@chromium.org> wrote:
>
> Introducing a chosen node, rng-seed, which is an entropy that can be
> passed to kernel called very early to increase initial device
> randomness. Bootloader should provide this entropy and the value is
> read from /chosen/rng-seed in DT.
>
> Signed-off-by: Hsin-Yi Wang <hsinyi@chromium.org>
> ---
> change log v2->v4:
> * v3 abandoned
> * fix doc error
> ---
> Documentation/devicetree/bindings/chosen.txt | 14 ++++++++++++++
> drivers/of/fdt.c | 10 ++++++++++
> 2 files changed, 24 insertions(+)
>
> diff --git a/Documentation/devicetree/bindings/chosen.txt b/Documentation/devicetree/bindings/chosen.txt
> index 45e79172a646..678e81bc4383 100644
> --- a/Documentation/devicetree/bindings/chosen.txt
> +++ b/Documentation/devicetree/bindings/chosen.txt
> @@ -28,6 +28,20 @@ mode) when EFI_RNG_PROTOCOL is supported, it will be overwritten by
> the Linux EFI stub (which will populate the property itself, using
> EFI_RNG_PROTOCOL).
>
> +rng-seed
> +-----------
> +
> +This property serves as an entropy to add device randomness. It is parsed
> +as a byte array, e.g.
> +
> +/ {
> + chosen {
> + rng-seed = <0x31 0x95 0x1b 0x3c 0xc9 0xfa 0xb3 ...>;
> + };
> +};
> +
> +This random value should be provided by bootloader.
> +
> stdout-path
> -----------
>
> diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c
> index de893c9616a1..7f3d72921b23 100644
> --- a/drivers/of/fdt.c
> +++ b/drivers/of/fdt.c
> @@ -24,6 +24,7 @@
> #include <linux/debugfs.h>
> #include <linux/serial_core.h>
> #include <linux/sysfs.h>
> +#include <linux/random.h>
Alphabetical order.
>
> #include <asm/setup.h> /* for COMMAND_LINE_SIZE */
> #include <asm/page.h>
> @@ -1079,6 +1080,7 @@ int __init early_init_dt_scan_chosen(unsigned long node, const char *uname,
> {
> int l;
> const char *p;
> + const void *rng_seed;
>
> pr_debug("search \"chosen\", depth: %d, uname: %s\n", depth, uname);
>
> @@ -1113,6 +1115,14 @@ int __init early_init_dt_scan_chosen(unsigned long node, const char *uname,
>
> pr_debug("Command line is: %s\n", (char*)data);
>
> + rng_seed = of_get_flat_dt_prop(node, "rng-seed", &l);
> + if (rng_seed && l > 0) {
> + add_device_randomness(rng_seed, l);
> +
> + /* try to clear seed so it won't be found. */
> + fdt_delprop(initial_boot_params, node, "rng-seed");
I'm a little bit concerned about this, as we really want the rng-seed
value to be wiped, and not kept in memory (even if it's hard to
access).
IIUC, fdt_delprop splices the device tree, so it'll override
"rng-seed" property with whatever device tree entries follow it.
However, if rng-seed is the last property (or if the entries that
follow are smaller than rng-seed), the seed will stay in memory (or
part of it).
fdt_nop_property in v2 would erase it for sure. I don't know if there
is a way to make sure that rng-seed is removed for good while still
deleting the property (maybe modify fdt_splice_ to do a memset(.., 0)
of the moved chunk?).
> + }
> +
> /* break now */
> return 1;
> }
> --
> 2.20.1
>
next prev parent reply other threads:[~2019-05-19 23:55 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-19 16:04 [PATCH v4 1/3] amr64: map FDT as RW for early_init_dt_scan() Hsin-Yi Wang
2019-05-19 16:04 ` [PATCH v4 2/3] fdt: add support for rng-seed Hsin-Yi Wang
2019-05-19 23:54 ` Nicolas Boichat [this message]
2019-05-21 4:09 ` Hsin-Yi Wang
2019-05-21 12:42 ` Nicolas Boichat
2019-05-19 16:04 ` [PATCH v4 3/3] arm64: kexec_file: add rng-seed support Hsin-Yi Wang
2019-05-19 23:57 ` [PATCH v4 1/3] amr64: map FDT as RW for early_init_dt_scan() Nicolas Boichat
2019-05-24 0:04 ` Stephen Boyd
2019-05-25 9:30 ` Mike Rapoport
2019-05-24 21:58 ` Rob Herring
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CANMq1KB7sh=UXaM4sMm_THjZ_wV3Thgr6_ona-TJFqA2QQHALA@mail.gmail.com' \
--to=drinkcat@chromium.org \
--cc=akpm@linux-foundation.org \
--cc=andrew.murray@arm.com \
--cc=ard.biesheuvel@linaro.org \
--cc=catalin.marinas@arm.com \
--cc=devicetree@vger.kernel.org \
--cc=frowand.list@gmail.com \
--cc=hsinyi@chromium.org \
--cc=james.morse@arm.com \
--cc=keescook@chromium.org \
--cc=labbott@redhat.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=miles.chen@mediatek.com \
--cc=robh+dt@kernel.org \
--cc=robin.murphy@arm.com \
--cc=rppt@linux.ibm.com \
--cc=swboyd@chromium.org \
--cc=will.deacon@arm.com \
--cc=yaojun8558363@gmail.com \
--cc=yuzhao@google.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).