Received-SPF: pass (google.com: domain of linux-crypto-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
MIME-Version: 1.0
References: <20220323041123.146459-1-Jason@zx2c4.com>
In-Reply-To: <20220323041123.146459-1-Jason@zx2c4.com>
From:   Ard Biesheuvel <ardb@kernel.org>
Date:   Wed, 23 Mar 2022 22:56:19 +0100
Message-ID: <CAMj1kXGL2J65=ZD7mKEheoPjJFfAeAEx57V35htpbjbpgKDV6g@mail.gmail.com>
Subject: Re: [PATCH] random: treat bootloader trust toggle the same way as cpu
 trust toggle
To:     "Jason A. Donenfeld" <Jason@zx2c4.com>
Cc:     Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Crypto Mailing List <linux-crypto@vger.kernel.org>,
        Dominik Brodowski <linux@dominikbrodowski.net>,
        "Theodore Ts'o" <tytso@mit.edu>,
        Graham Christensen <graham@grahamc.com>
Content-Type: text/plain; charset="UTF-8"
Precedence: bulk

On Wed, 23 Mar 2022 at 05:11, Jason A. Donenfeld <Jason@zx2c4.com> wrote:
>
> If CONFIG_RANDOM_TRUST_CPU is set, the RNG initializes using RDRAND.
> But, the user can disable (or enable) this behavior by setting
> `random.trust_cpu=0/1` on the kernel command line. This allows system
> builders to do reasonable things while avoiding howls from tinfoil
> hatters. (Or vice versa.)
>
> CONFIG_RANDOM_TRUST_BOOTLOADER is basically the same thing, but regards
> the seed passed via EFI or device tree, which might come from RDRAND or
> a TPM or somewhere else. In order to allow distros to more easily enable
> this while avoiding those same howls (or vice versa), this commit adds
> the corresponding `random.trust_bootloader=0/1` toggle.
>
> Cc: Dominik Brodowski <linux@dominikbrodowski.net>
> Cc: Theodore Ts'o <tytso@mit.edu>
> Cc: Graham Christensen <graham@grahamc.com>
> Link: https://github.com/NixOS/nixpkgs/pull/165355
> Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>

Reviewed-by: Ard Biesheuvel <ardb@kernel.org>

> ---
>  drivers/char/random.c | 8 +++++++-
>  1 file changed, 7 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/char/random.c b/drivers/char/random.c
> index 7b7f5e6596c2..c8974e5f57e1 100644
> --- a/drivers/char/random.c
> +++ b/drivers/char/random.c
> @@ -948,11 +948,17 @@ static bool drain_entropy(void *buf, size_t nbytes, bool force)
>   **********************************************************************/
>
>  static bool trust_cpu __ro_after_init = IS_ENABLED(CONFIG_RANDOM_TRUST_CPU);
> +static bool trust_bootloader __ro_after_init = IS_ENABLED(CONFIG_RANDOM_TRUST_BOOTLOADER);
>  static int __init parse_trust_cpu(char *arg)
>  {
>         return kstrtobool(arg, &trust_cpu);
>  }
> +static int __init parse_trust_bootloader(char *arg)
> +{
> +       return kstrtobool(arg, &trust_bootloader);
> +}
>  early_param("random.trust_cpu", parse_trust_cpu);
> +early_param("random.trust_bootloader", parse_trust_bootloader);
>
>  /*
>   * The first collection of entropy occurs at system boot while interrupts
> @@ -1160,7 +1166,7 @@ EXPORT_SYMBOL_GPL(add_hwgenerator_randomness);
>   */
>  void add_bootloader_randomness(const void *buf, size_t size)
>  {
> -       if (IS_ENABLED(CONFIG_RANDOM_TRUST_BOOTLOADER))
> +       if (trust_bootloader)
>                 add_hwgenerator_randomness(buf, size, size * 8);
>         else
>                 add_device_randomness(buf, size);
> --
> 2.35.1
>