m68k: pass rng seed via BI_VIRT_RNG_SEED
Subsystems (2)
PATCH 1/1 m68k: pass rng seed via BI_VIRT_RNG_SEED
In order to pass fresh entropy to kexec'd kernels, use BI_VIRT_RNG_SEED for passing a seed, with the same semantics that kexec-tools currently uses for i386's setup_data.
---
Geert - I don't have a toolchain for testing this. Could you verify it works, if you have a chance? -Jason
kexec/arch/m68k/bootinfo.c | 22 ++++++++++++++++++++++ kexec/arch/m68k/bootinfo.h | 6 ++++++ kexec/arch/m68k/kexec-elf-m68k.c | 1 + 3 files changed, 29 insertions(+)
kexec/arch/m68k/bootinfo.c +22 -0
@@ -135,40 +135,45 @@ void bootinfo_print(void) size = bi->size;switch (tag) {case BI_MACHTYPE :printf ("BI_MACHTYPE: 0x%08x\n" , bi->machtype);break ;case BI_MEMCHUNK :printf ("BI_MEMCHUNK: 0x%08x bytes at 0x%08x\n" , bi->mem_info.size, bi->mem_info.addr);break ;case BI_RAMDISK :printf ("BI_RAMDISK: 0x%08x bytes at 0x%08x\n" , bi->mem_info.size, bi->mem_info.addr);break ;case BI_COMMAND_LINE :printf ("BI_COMMAND_LINE: %s\n" , bi->string);break ; +case BI_VIRT_RNG_SEED : +/* These are secret, so never print them to the console */ +printf ("BI_VIRT_RNG_SEED: 0x%08x bytes\n" ,be16_to_cpu (bi->bytes.len)); +break ; +default :printf ("BI tag 0x%04x size %u\n" , tag, size);break ; } bi =bi_next (bi, size); } }int bootinfo_get_memory_ranges (struct memory_range **range) {struct memory_range *ranges;unsigned int i;struct bi_rec *bi; ranges =xmalloc (num_memchunks *sizeof (struct memory_range ));for (i =0 , bi =NULL ; i < num_memchunks && (bi =bi_find (bi,BI_MEMCHUNK )); i++) { ranges[i].start = bi->mem_info.addr; ranges[i].end = bi->mem_info.addr + bi->mem_info.size -1 ; ranges[i].type =RANGE_RAM ;
@@ -195,40 +200,57 @@ void bootinfo_set_cmdline(const char *cmdline)memcpy (bi->string, cmdline, size); }void bootinfo_set_ramdisk (unsigned long ramdisk_addr,unsigned long ramdisk_size) {struct bi_rec *bi;/* Remove existing ramdisk records */ bi_remove (BI_RAMDISK );if (!ramdisk_size)return ;/* Add new ramdisk record */ bi =bi_add (BI_RAMDISK ,sizeof (bi->mem_info)); bi->mem_info.addr = ramdisk_addr; bi->mem_info.size = ramdisk_size; } +void bootinfo_add_rng_seed (void ) +{ +struct bi_rec *bi; +enum {RNG_SEED_LEN =32 }; + +/* Remove existing rng seed records */ +bi_remove (BI_VIRT_RNG_SEED ); + +/* Add new rng seed record */ + bi =bi_add (BI_VIRT_RNG_SEED ,sizeof (bi->bytes) +RNG_SEED_LEN ); +if (getrandom (bi->bytes.data,RNG_SEED_LEN ,GRND_NONBLOCK ) !=RNG_SEED_LEN ) { +bi_remove (BI_VIRT_RNG_SEED ); +return ; + } + bi->bytes.len =cpu_to_be16 (RNG_SEED_LEN ); +} +/* * Check the bootinfo version in the kernel image * All failures are non-fatal, as kexec may be used to load * non-Linux images */ void bootinfo_check_bootversion (const struct kexec_info *info) {struct bi_rec *bi;const struct bootversion *bv;uint16_t major, minor;unsigned int i; bv = info->segment[0 ].buf;if (bv->magic !=BOOTINFOV_MAGIC ) {printf ("WARNING: No bootversion in kernel image\n" );return ; }
kexec/arch/m68k/bootinfo.h +6 -0
@@ -1,43 +1,49 @@#include <asm/bootinfo.h> +#include <asm/bootinfo-virt.h> #define DEFAULT_BOOTINFO_FILE "/proc/bootinfo"#define MAX_BOOTINFO_SIZE 1536/* * Convenience overlay of several struct bi_record variants */ struct bi_rec {__be16 tag;__be16 size;union {__be32 data[0 ];/* shorthands for the types we use */ __be32 machtype;struct {__be32 addr;__be32 size; } mem_info;char string[0 ]; +struct { +__be16 len; +u8 data[0 ]; + } bytes; }; };/* * We only support the "new" tagged bootinfo (v2) */ #define SUPPORTED_BOOTINFO_VERSION 2extern const char *bootinfo_file;extern void bootinfo_load (void );extern void bootinfo_print (void );extern int bootinfo_get_memory_ranges (struct memory_range **range);extern void bootinfo_set_cmdline (const char *cmdline);extern void bootinfo_set_ramdisk (unsigned long ramdisk_addr,unsigned long ramdisk_size); +extern void bootinfo_add_rng_seed (void );extern void bootinfo_check_bootversion (const struct kexec_info *info);extern void add_bootinfo (struct kexec_info *info,unsigned long addr);
kexec/arch/m68k/kexec-elf-m68k.c +1 -0
@@ -145,38 +145,39 @@ int elf_m68k_load(int argc, char **argv, const char *buf, off_t len, bootinfo_addr =segment_end (info, info->nr_segments -1 ) +1 ;/* Load ramdisk */ if (ramdisk_file) {void *ramdisk =slurp_decompress_file (ramdisk_file, &ramdisk_size);/* Store ramdisk at top of first memory chunk */ ramdisk_addr =_ALIGN_DOWN (info->memory_range[0 ].end - ramdisk_size +1 ,PAGE_SIZE );if (!buf)die ("Ramdisk load failed\n" );add_buffer (info, ramdisk, ramdisk_size, ramdisk_size,PAGE_SIZE , ramdisk_addr, info->memory_range[0 ].end,1 ); }/* Update and add bootinfo */ bootinfo_set_cmdline (cmdline);bootinfo_set_ramdisk (ramdisk_addr, ramdisk_size); +bootinfo_add_rng_seed ();if (kexec_debug)bootinfo_print ();add_bootinfo (info, bootinfo_addr);/* * Check if the kernel (and bootinfo) exceed 4 MiB, as current kernels * don't support that. * As the segments are still unsorted, the bootinfo is located in the * last segment. */ if (segment_end(info, info->nr_segments - 1) >= virt_to_phys(4 MiB - 1))printf ("WARNING: Kernel is larger than 4 MiB\n" );/* Check struct bootversion at start of kernel */ bootinfo_check_bootversion (info);return 0 ; }
Signature · 1 line
2.37.3
kexec/arch/m68k/bootinfo.c
Quoted 12 lines · Jason A. Donenfeld
Geert - I don't have a toolchain for testing this. Could you verify it works, if you have a chance? -Jason
kexec/arch/m68k/bootinfo.c | 22 ++++++++++++++++++++++ kexec/arch/m68k/bootinfo.h | 6 ++++++ kexec/arch/m68k/kexec-elf-m68k.c | 1 + 3 files changed, 29 insertions(+)kexec/arch/m68k/bootinfo.c +0
-0
I forgot to add #include <sys/random.h> I suspect.
Hi Jason,
Quoted 6 lines · Jason A. Donenfeld
In order to pass fresh entropy to kexec'd kernels, use
BI_VIRT_RNG_SEEDfor passing a seed, with the same semantics that kexec-tools currently uses for i386'ssetup_data.Cc Geert Uytterhoeven <[email protected]>Signed-off-by Jason A. Donenfeld <[email protected]>
Thanks for your patch!
Quoted 8 lines
kexec/arch/m68k/bootinfo.c +0
-0@@ -135,40 +135,45 @@ void bootinfo_print(void) size = bi->size;switch (tag) {case BI_MACHTYPE :printf ("BI_MACHTYPE: 0x%08x\n" , bi->machtype);break ;
kexec/arch/m68k/bootinfo.c void bootinfo_print(void) · line 149
Quoted 10 lines
kexec/arch/m68k/bootinfo.c +0
-0case BI_MEMCHUNK :printf ("BI_MEMCHUNK: 0x%08x bytes at 0x%08x\n" , bi->mem_info.size, bi->mem_info.addr);break ;case BI_RAMDISK :printf ("BI_RAMDISK: 0x%08x bytes at 0x%08x\n" , bi->mem_info.size, bi->mem_info.addr);break ;
Hmm, lots of context.
kexec/arch/m68k/bootinfo.c void bootinfo_print(void) · line 155
Quoted 6 lines
kexec/arch/m68k/bootinfo.c +1
-0case BI_COMMAND_LINE :printf ("BI_COMMAND_LINE: %s\n" , bi->string);break ; +case BI_VIRT_RNG_SEED :
This won't work as expected: BI_VIRT_* tags are only valid if the machine type is MACH_VIRT.
Worse, this will trigger for other platform-specific tags using the same value:
arch/m68k/include/uapi/asm/bootinfo-amiga.h:#defineBI_AMIGA_CHIPSET 0x8006 /* native chipset present (__be32) */
arch/m68k/include/uapi/asm/bootinfo-mac.h:#define BI_MAC_SCCBASE
0x8006 /* Mac SCC base address */
arch/m68k/include/uapi/asm/bootinfo-virt.h:#defineBI_VIRT_RNG_SEED 0x8006
Quoted 14 lines
kexec/arch/m68k/bootinfo.c +4
-0+/* These are secret, so never print them to the console */ +printf ("BI_VIRT_RNG_SEED: 0x%08x bytes\n" ,be16_to_cpu (bi->bytes.len)); +break ; +default :printf ("BI tag 0x%04x size %u\n" , tag, size);break ; } bi =bi_next (bi, size); } } }
kexec/arch/m68k/bootinfo.c void bootinfo_print(void)
Quoted 10 lines
kexec/arch/m68k/bootinfo.c +10
-0+void bootinfo_add_rng_seed (void ) +{ +struct bi_rec *bi; +enum {RNG_SEED_LEN =32 }; + +/* Remove existing rng seed records */ +bi_remove (BI_VIRT_RNG_SEED ); + +/* Add new rng seed record */ + bi =bi_add (BI_VIRT_RNG_SEED ,sizeof (bi->bytes) +RNG_SEED_LEN );
Likewise, this will destroy existing BI_AMIGA_CHIPSET and BI_MAC_SCCBASE tags, breaking Amiga and Mac.
kexec/arch/m68k/bootinfo.c void bootinfo_set_cmdline(const char *cmdline) · line 236
Quoted 8 lines
kexec/arch/m68k/bootinfo.c +7
-0+if (getrandom (bi->bytes.data,RNG_SEED_LEN ,GRND_NONBLOCK ) !=RNG_SEED_LEN ) { +bi_remove (BI_VIRT_RNG_SEED ); +return ; + } + bi->bytes.len =cpu_to_be16 (RNG_SEED_LEN ); +} +
As random seeds can now be generic, I think it makes sense to introduce a machine-independent BI_RND_SEED.
In hindsight, we should have done this from the beginning...
Quoted 20 lines
kexec/arch/m68k/bootinfo.h +1
-0@@ -1,43 +1,49 @@#include <asm/bootinfo.h> +#include <asm/bootinfo-virt.h> #define DEFAULT_BOOTINFO_FILE "/proc/bootinfo"#define MAX_BOOTINFO_SIZE 1536/* * Convenience overlay of several struct bi_record variants */ struct bi_rec {__be16 tag;__be16 size;union {__be32 data[0 ];/* shorthands for the types we use */
kexec/arch/m68k/bootinfo.h line 27
Quoted 10 lines
kexec/arch/m68k/bootinfo.h +4
-0__be32 machtype;struct {__be32 addr;__be32 size; } mem_info;char string[0 ]; +struct { +__be16 len; +u8 data[0 ]; + } bytes;
I'd rather call this rng_seed, to avoid confusion between "data" and "bytes",
kexec/arch/m68k/bootinfo.h line 29
Quoted 2 lines
kexec/arch/m68k/bootinfo.h +0
-0}; };
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]
In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
_______________________________________________
kexec mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/kexec
Hi Geert,
Quoted 8 lines · Geert Uytterhoeven
This won't work as expected: BI_VIRT_* tags are only valid if the machine type is
MACH_VIRT.
Worse, this will trigger for other platform-specific tags using the same value:
Likewise, this will destroy existingBI_AMIGA_CHIPSETandBI_MAC_SCCBASEtags, breaking Amiga and Mac.
As random seeds can now be generic, I think it makes sense to introduce a machine-independentBI_RND_SEED.
In hindsight, we should have done this from the beginning...
Yes, I agree. I thought that would be rejected, though, which is why I didn't do that before. I'll send a patch switching over to that. There's no point in keeping the old one around, I don't think, so I'll just move everything over to the new.
Jason
_______________________________________________
kexec mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/kexec
PATCH v2 1/1 m68k: pass rng seed via BI_RNG_SEED
In order to pass fresh entropy to kexec'd kernels, use BI_RNG_SEED for passing a seed, with the same semantics that kexec-tools currently uses for i386's setup_data.
---
Geert - this hasn't been compile tested yet and also depends on changes that haven't yet landed upstream. Posting this preliminarily now. -Jason
kexec/arch/m68k/bootinfo.c | 23 +++++++++++++++++++++++ kexec/arch/m68k/bootinfo.h | 5 +++++ kexec/arch/m68k/kexec-elf-m68k.c | 1 + 3 files changed, 29 insertions(+)
kexec/arch/m68k/bootinfo.c +23 -0
@@ -2,6 +2,7 @@#include <stdio.h> #include <stdlib.h> #include <string.h> +#include <sys/random.h> #include "../../kexec.h"
@@ -152,6 +153,11 @@ void bootinfo_print(void)printf ("BI_COMMAND_LINE: %s\n" , bi->string);break ; +case BI_RNG_SEED : +/* These are secret, so never print them to the console */ +printf ("BI_RNG_SEED: 0x%08x bytes\n" ,be16_to_cpu (bi->rng_seed.len)); +break ; +default :printf ("BI tag 0x%04x size %u\n" , tag, size);break ;
@@ -212,6 +218,23 @@ void bootinfo_set_ramdisk(unsigned long ramdisk_addr, bi->mem_info.size = ramdisk_size; } +void bootinfo_add_rng_seed (void ) +{ +enum {RNG_SEED_LEN =32 }; +struct bi_rec *bi; + +/* Remove existing rng seed records */ +bi_remove (BI_RNG_SEED ); + +/* Add new rng seed record */ + bi =bi_add (BI_RNG_SEED ,sizeof (bi->rng_seed) +RNG_SEED_LEN ); +if (getrandom (bi->rng_seed.data,RNG_SEED_LEN ,GRND_NONBLOCK ) !=RNG_SEED_LEN ) { +bi_remove (BI_RNG_SEED ); +return ; + } + bi->rng_seed.len =cpu_to_be16 (RNG_SEED_LEN ); +} +/* * Check the bootinfo version in the kernel image
kexec/arch/m68k/bootinfo.h +5 -0
@@ -20,6 +20,10 @@ struct bi_rec {__be32 size; } mem_info;char string[0 ]; +struct { +__be16 len; +u8 data[0 ]; + } rng_seed; }; };
@@ -39,5 +43,6 @@ extern int bootinfo_get_memory_ranges(struct memory_range **range);extern void bootinfo_set_cmdline (const char *cmdline);extern void bootinfo_set_ramdisk (unsigned long ramdisk_addr,unsigned long ramdisk_size); +extern void bootinfo_add_rng_seed (void );extern void bootinfo_check_bootversion (const struct kexec_info *info);extern void add_bootinfo (struct kexec_info *info,unsigned long addr);
kexec/arch/m68k/kexec-elf-m68k.c +1 -0
@@ -162,6 +162,7 @@ int elf_m68k_load(int argc, char **argv, const char *buf, off_t len,/* Update and add bootinfo */ bootinfo_set_cmdline (cmdline);bootinfo_set_ramdisk (ramdisk_addr, ramdisk_size); +bootinfo_add_rng_seed ();if (kexec_debug)bootinfo_print ();add_bootinfo (info, bootinfo_addr);
Signature · 7 lines
2.37.3 _______________________________________________ kexec mailing list [email protected] http://lists.infradead.org/mailman/listinfo/kexec
Re: [PATCH v2] m68k: pass rng seed via BI_RNG_SEED
Quoted 9 lines · Jason A. Donenfeld
In order to pass fresh entropy to kexec'd kernels, use
BI_RNG_SEEDfor passing a seed, with the same semantics that kexec-tools currently uses for i386'ssetup_data.Cc Geert Uytterhoeven <[email protected]>Signed-off-by Jason A. Donenfeld <[email protected]>---
Geert - this hasn't been compile tested yet and also depends on changes that haven't yet landed upstream. Posting this preliminarily now. -Jason
With [1] having landed, does this patch here suffice for kexec-tools?
Jason
_______________________________________________
kexec mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/kexec