From: Anton Ivanov <anton.ivanov@cambridgegreys.com>
To: "Jason A. Donenfeld" <Jason@zx2c4.com>,
linux-um@lists.infradead.org, linux-kernel@vger.kernel.org,
johannes@sipsolutions.net
Cc: stable@vger.kernel.org
Subject: Re: [PATCH] um: seed rng using host OS rng
Date: Wed, 13 Jul 2022 07:58:34 +0100 [thread overview]
Message-ID: <d20a629c-8c15-ca8a-c34a-c5c084dbee03@cambridgegreys.com> (raw)
In-Reply-To: <20220712232738.77737-1-Jason@zx2c4.com>
On 13/07/2022 00:27, Jason A. Donenfeld wrote:
> UML generally does not provide access to special CPU instructions like
> RDRAND, and execution tends to be rather deterministic, with no real
> hardware interrupts, making good randomness really very hard, if not
> all together impossible. Not only is this a security eyebrow raiser, but
> it's also quite annoying when trying to do various pieces of UML-based
> automation that takes a long time to boot, if ever.
>
> Fix this by trivially calling getrandom() in the host and using that
> seed as "bootloader randomness", which initializes the rng immediately
> at UML boot.
>
> The old behavior can be restored the same way as on any other arch, by
> way of CONFIG_TRUST_BOOTLOADER_RANDOMNESS=n or
> random.trust_bootloader=0. So seen from that perspective, this just
> makes UML act like other archs, which is positive in its own right.
>
> Cc: stable@vger.kernel.org
> Cc: Johannes Berg <johannes@sipsolutions.net>
> Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
> ---
> arch/um/include/shared/os.h | 7 +++++++
> arch/um/kernel/um_arch.c | 8 ++++++++
> arch/um/os-Linux/util.c | 6 ++++++
> 3 files changed, 21 insertions(+)
>
> diff --git a/arch/um/include/shared/os.h b/arch/um/include/shared/os.h
> index fafde1d5416e..79644dd88d58 100644
> --- a/arch/um/include/shared/os.h
> +++ b/arch/um/include/shared/os.h
> @@ -11,6 +11,12 @@
> #include <irq_user.h>
> #include <longjmp.h>
> #include <mm_id.h>
> +/* This is to get size_t */
> +#ifndef __UM_HOST__
> +#include <linux/types.h>
> +#else
> +#include <stddef.h>
> +#endif
>
> #define CATCH_EINTR(expr) while ((errno = 0, ((expr) < 0)) && (errno == EINTR))
>
> @@ -243,6 +249,7 @@ extern void stack_protections(unsigned long address);
> extern int raw(int fd);
> extern void setup_machinename(char *machine_out);
> extern void setup_hostinfo(char *buf, int len);
> +extern ssize_t os_getrandom(void *buf, size_t len, unsigned int flags);
> extern void os_dump_core(void) __attribute__ ((noreturn));
> extern void um_early_printk(const char *s, unsigned int n);
> extern void os_fix_helper_signals(void);
> diff --git a/arch/um/kernel/um_arch.c b/arch/um/kernel/um_arch.c
> index 0760e24f2eba..74f3efd96bd4 100644
> --- a/arch/um/kernel/um_arch.c
> +++ b/arch/um/kernel/um_arch.c
> @@ -16,6 +16,7 @@
> #include <linux/sched/task.h>
> #include <linux/kmsg_dump.h>
> #include <linux/suspend.h>
> +#include <linux/random.h>
>
> #include <asm/processor.h>
> #include <asm/cpufeature.h>
> @@ -406,6 +407,8 @@ int __init __weak read_initrd(void)
>
> void __init setup_arch(char **cmdline_p)
> {
> + u8 rng_seed[32];
> +
> stack_protections((unsigned long) &init_thread_info);
> setup_physmem(uml_physmem, uml_reserved, physmem_size, highmem);
> mem_total_pages(physmem_size, iomem_size, highmem);
> @@ -416,6 +419,11 @@ void __init setup_arch(char **cmdline_p)
> strlcpy(boot_command_line, command_line, COMMAND_LINE_SIZE);
> *cmdline_p = command_line;
> setup_hostinfo(host_info, sizeof host_info);
> +
> + if (os_getrandom(rng_seed, sizeof(rng_seed), 0) == sizeof(rng_seed)) {
> + add_bootloader_randomness(rng_seed, sizeof(rng_seed));
> + memzero_explicit(rng_seed, sizeof(rng_seed));
> + }
> }
>
> void __init check_bugs(void)
> diff --git a/arch/um/os-Linux/util.c b/arch/um/os-Linux/util.c
> index 41297ec404bf..fc0f2a9dee5a 100644
> --- a/arch/um/os-Linux/util.c
> +++ b/arch/um/os-Linux/util.c
> @@ -14,6 +14,7 @@
> #include <sys/wait.h>
> #include <sys/mman.h>
> #include <sys/utsname.h>
> +#include <sys/random.h>
> #include <init.h>
> #include <os.h>
>
> @@ -96,6 +97,11 @@ static inline void __attribute__ ((noreturn)) uml_abort(void)
> exit(127);
> }
>
> +ssize_t os_getrandom(void *buf, size_t len, unsigned int flags)
> +{
> + return getrandom(buf, len, flags);
> +}
> +
> /*
> * UML helper threads must not handle SIGWINCH/INT/TERM
> */
I am probably missing something here.
IIRC UML RNG device reads directly from host.
If you are using UMLs own /dev/random you are effectively using the host
one.
So unless I am mistaken, you need extra randomness only if you do not
have UMLs /dev/random compiled in.
Apologies for possible duplicates - I initially did not reply-all by
mistake.
--
Anton R. Ivanov
Cambridgegreys Limited. Registered in England. Company Number 10273661
https://www.cambridgegreys.com/
next prev parent reply other threads:[~2022-07-13 7:30 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-07-12 23:27 Jason A. Donenfeld
2022-07-13 6:58 ` Anton Ivanov [this message]
2022-07-13 7:03 ` Johannes Berg
2022-07-13 7:05 ` Johannes Berg
2022-07-13 9:53 ` Jason A. Donenfeld
2022-07-13 9:58 ` [PATCH v2] " Jason A. Donenfeld
2022-07-17 8:46 ` [PATCH v3] " Jason A. Donenfeld
2022-07-17 10:50 ` [PATCH v4] " Jason A. Donenfeld
2022-07-17 10:51 ` Johannes Berg
2022-07-13 7:06 ` [PATCH] " Anton Ivanov
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=d20a629c-8c15-ca8a-c34a-c5c084dbee03@cambridgegreys.com \
--to=anton.ivanov@cambridgegreys.com \
--cc=Jason@zx2c4.com \
--cc=johannes@sipsolutions.net \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-um@lists.infradead.org \
--cc=stable@vger.kernel.org \
/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
all inboxes | Powered by JetHome®