um: seed rng using host OS rng
Subsystems (2)
PATCH 1/1 um: seed rng using host OS rng
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.
--- 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(+)
arch/um/include/shared/os.h +7 -0
@@ -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 );
arch/um/kernel/um_arch.c +8 -0
@@ -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 )
arch/um/os-Linux/util.c +6 -0
@@ -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 */
Signature · 7 lines
2.35.1 _______________________________________________ linux-um mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-um
Anton Ivanov
maintainerQuoted 97 lines · Jason A. Donenfeld
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=nor 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 Johannes Berg <[email protected]>Signed-off-by Jason A. Donenfeld <[email protected]>--- 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(+)arch/um/include/shared/os.h +7
-0@@ -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 );arch/um/kernel/um_arch.c +8
-0@@ -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 )arch/um/os-Linux/util.c +1
-0@@ -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 );
arch/um/os-Linux/util.c static inline void __attribute__ ((noreturn)) uml_abort(void) · line 107
Quoted 10 lines
arch/um/os-Linux/util.c +5
-0} +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.
Signature · 8 lines
Anton R. Ivanov Cambridgegreys Limited. Registered in England. Company Number 10273661 https://www.cambridgegreys.com/ _______________________________________________ linux-um mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-um
Johannes Berg
maintainerQuoted 2 lines · Anton Ivanov
IIRC UML RNG device reads directly from host.
Yes, but that's a /dev/hwrng device, so you still need some userspace to feed entropy from that into /dev/random.
Quoted 5 lines
If you are using UMLs own
/dev/randomyou are effectively using the host one.So unless I am mistaken, you need extra randomness only if you do not have UMLs
/dev/randomcompiled in.
No, neither of those is true.
johannes
_______________________________________________
linux-um mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-um
Quoted 10 lines · Johannes Berg
Quoted 1 line · Anton Ivanov
IIRC UML RNG device reads directly from host.
Yes, but that's a
/dev/hwrngdevice, so you still need some userspace to feed entropy from that into/dev/random.Quoted 4 lines
If you are using UMLs own
/dev/randomyou are effectively using the host one.
So unless I am mistaken, you need extra randomness only if you do not have UMLs/dev/randomcompiled in.No, neither of those is true.
OK, Cool.
Quoted 10 lines
johannes
_______________________________________________
linux-um mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-um
Signature · 8 lines
Anton R. Ivanov https://www.kot-begemot.co.uk/ _______________________________________________ linux-um mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-um
Johannes Berg
maintainerQuoted 16 lines · Jason A. Donenfeld
+++
b/arch/um/include/shared/os.harch/um/include/shared/os.h +6
-0@@ -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))
arch/um/include/shared/os.h extern void stack_protections(unsigned long address); · line 252
Quoted 4 lines
arch/um/include/shared/os.h +1
-0@@ -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);
For me, this doesn't compile, and per the man-page on my system, ssize_t requires <sys/types.h>, not <stddef.h>?
johannes
_______________________________________________
linux-um mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-um
Hi Johannes,
Thanks for the review.
Quoted 16 lines · Johannes Berg
Quoted 15 lines · Jason A. Donenfeld
+++
b/arch/um/include/shared/os.harch/um/include/shared/os.h +6
-0@@ -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))
Quoted 8 lines
arch/um/include/shared/os.h extern void stack_protections(unsigned long address); · line 252
Quoted 5 lines
arch/um/include/shared/os.h +1
-0@@ -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);For me, this doesn't compile, and per the man-page on my system,
ssize_trequires <sys/types.h>, not <stddef.h>?
What you say about types.h strikes me as true from how libc programming usually works everywhere else. But I actually copy and pasted that snippet, including the comment, from user.h. So I guess user.h doesn't break because of something else. Anyway, I'll change it to sys/types.h and send a v2.
Jason
_______________________________________________
linux-um mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-um
PATCH v2 1/1 um: seed rng using host OS rng
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.
---
Changes v1->v2:
- Include sys/types.h instead of stddef.h.
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(+)
arch/um/include/shared/os.h +7 -0
@@ -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 <sys/types.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 );
arch/um/kernel/um_arch.c +8 -0
@@ -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 )
arch/um/os-Linux/util.c +6 -0
@@ -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 */
Signature · 7 lines
2.35.1 _______________________________________________ linux-um mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-um
PATCH v3 1/1 um: seed rng using host OS rng
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.
Additionally, wire up arch_get_random_{int,long}() in the same way, so that reseeds can also make use of the host RNG, controllable by CONFIG_TRUST_CPU_RANDOMNESS and random.trust_cpu, per usual.
---
Johannes - I need to take this through random.git, because it relies on some other changes living there. Is that okay with you? -Jason
arch/um/include/asm/archrandom.h | 27 +++++++++++++++++++++++++++ arch/um/include/shared/os.h | 7 +++++++ arch/um/kernel/um_arch.c | 8 ++++++++ arch/um/os-Linux/util.c | 6 ++++++ 4 files changed, 48 insertions(+) create mode 100644 arch/um/include/asm/archrandom.h
arch/um/include/asm/archrandom.h new file +27 -0
@@ -0,0 +1,27 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef __ASM_UM_ARCHRANDOM_H__ +#define __ASM_UM_ARCHRANDOM_H__ + +#include <os.h> + +static inline bool __must_check arch_get_random_long (unsigned long *v) +{ +return os_getrandom (v,sizeof (*v),0 ) ==sizeof (*v); +} + +static inline bool __must_check arch_get_random_int (unsigned int *v) +{ +return os_getrandom (v,sizeof (*v),0 ) ==sizeof (*v); +} + +static inline bool __must_check arch_get_random_seed_long (unsigned long *v) +{ +return false; +} + +static inline bool __must_check arch_get_random_seed_int (unsigned int *v) +{ +return false; +} + +#endif
arch/um/include/shared/os.h +7 -0
@@ -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 <sys/types.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 );
arch/um/kernel/um_arch.c +8 -0
@@ -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 )
arch/um/os-Linux/util.c +6 -0
@@ -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 */
Signature · 7 lines
2.35.1 _______________________________________________ linux-um mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-um
PATCH v4 1/1 um: seed rng using host OS rng
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.
Additionally, wire up arch_get_random_{int,long}() in the same way, so that reseeds can also make use of the host RNG, controllable by CONFIG_TRUST_CPU_RANDOMNESS and random.trust_cpu, per usual.
---
Johannes - I need to take this through random.git, because it relies on some other changes living there. Is that okay with you? -Jason
Changes v3->v4:
- Don't include os.h, per Johannes' suggestion.
arch/um/include/asm/archrandom.h | 30 ++++++++++++++++++++++++++++++ arch/um/include/shared/os.h | 7 +++++++ arch/um/kernel/um_arch.c | 8 ++++++++ arch/um/os-Linux/util.c | 6 ++++++ 4 files changed, 51 insertions(+) create mode 100644 arch/um/include/asm/archrandom.h
arch/um/include/asm/archrandom.h new file +30 -0
@@ -0,0 +1,30 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef __ASM_UM_ARCHRANDOM_H__ +#define __ASM_UM_ARCHRANDOM_H__ + +#include <linux/types.h> + +/* This is from <os.h>, but better not to #include that in a global header here. */ +ssize_t os_getrandom (void *buf,size_t len,unsigned int flags); + +static inline bool __must_check arch_get_random_long (unsigned long *v) +{ +return os_getrandom (v,sizeof (*v),0 ) ==sizeof (*v); +} + +static inline bool __must_check arch_get_random_int (unsigned int *v) +{ +return os_getrandom (v,sizeof (*v),0 ) ==sizeof (*v); +} + +static inline bool __must_check arch_get_random_seed_long (unsigned long *v) +{ +return false; +} + +static inline bool __must_check arch_get_random_seed_int (unsigned int *v) +{ +return false; +} + +#endif
arch/um/include/shared/os.h +7 -0
@@ -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 <sys/types.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 );
arch/um/kernel/um_arch.c +8 -0
@@ -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 )
arch/um/os-Linux/util.c +6 -0
@@ -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 */
Signature · 7 lines
2.35.1 _______________________________________________ linux-um mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-um
Quoted 20 lines · Jason A. Donenfeld
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=nor random.trust_bootloader=0. So seen from that perspective, this just makes UML act like other archs, which is positive in its own right.Additionally, wire up arch_get_random_{int,long}() in the same way, so that reseeds can also make use of the host RNG, controllable by
CONFIG_TRUST_CPU_RANDOMNESSand random.trust_cpu, per usual.
Quoted 7 lines
Cc Johannes Berg <[email protected]>Acked-by Anton Ivanov <[email protected]>Signed-off-by Jason A. Donenfeld <[email protected]>---
Johannes - I need to take this through random.git, because it relies on some other changes living there. Is that okay with you? -Jason
Sure, go ahead, thanks for doing this work!
Quoted 2 lines
Changes
v3->v4:
- Don't includeos.h, per Johannes' suggestion.
Thanks.
johannes
Quoted 97 lines · Jason A. Donenfeld
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=nor 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 Johannes Berg <[email protected]>Signed-off-by Jason A. Donenfeld <[email protected]>--- 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(+)arch/um/include/shared/os.h +7
-0@@ -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 );arch/um/kernel/um_arch.c +8
-0@@ -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 )arch/um/os-Linux/util.c +1
-0@@ -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 );
arch/um/os-Linux/util.c static inline void __attribute__ ((noreturn)) uml_abort(void) · line 107
Quoted 10 lines
arch/um/os-Linux/util.c +5
-0} +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 */
Signature · 7 lines
Anton R. Ivanov https://www.kot-begemot.co.uk/ _______________________________________________ linux-um mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-um