m68k: process bootinfo records before saving them
PATCH v3 1/3 m68k: process bootinfo records before saving them
The RNG seed boot record is memzeroed after processing, in order to preserve forward secrecy. By saving the bootinfo for procfs prior to that, forward secrecy is violated, since it becomes possible to recover past states. So, save the bootinfo block only after first processing them.
--- arch/m68k/kernel/setup_mm.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
arch/m68k/kernel/setup_mm.c +3 -2
@@ -109,10 +109,9 @@ extern void paging_init(void);static void __init m68k_parse_bootinfo (const struct bi_record *record) { +const struct bi_record *first_record = record;uint16_t tag; -save_bootinfo (record); -while ((tag =be16_to_cpu (record->tag)) !=BI_LAST ) {int unknown =0 ;const void *data = record->data;
@@ -182,6 +181,8 @@ static void __init m68k_parse_bootinfo(const struct bi_record *record) record = (struct bi_record *)((unsigned long )record + size); } +save_bootinfo (first_record); + m68k_realnum_memory = m68k_num_memory;#ifdef CONFIG_SINGLE_MEMORY_CHUNK if (m68k_num_memory >1 ) {
Signature · 1 line
2.37.3
PATCH v3 2/3 m68k: virt: generate new RNG seed on reboot
Rather than rebooting into a system with no entropy, regenerate the RNG seed before rebooting, so that the new system has a fresh seed.
--- arch/m68k/virt/config.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
arch/m68k/virt/config.c +10 -0
@@ -45,10 +45,18 @@ static void virt_halt(void) ; } +static const struct bi_record *rng_seed_record; +static void virt_reset (void ) {void __iomem *base = (void __iomem *)virt_bi_data.ctrl.mmio; +if (rng_seed_record && rng_seed_record->size >sizeof (*rng_seed_record) +2 ) { +u16 len = rng_seed_record->size -sizeof (*rng_seed_record) -2 ; +get_random_bytes ((u8 *)rng_seed_record->data +2 , len); + *(u16 *)rng_seed_record->data =cpu_to_be16 (len); + } +iowrite32be (CMD_RESET , base +VIRT_CTRL_REG_CMD );local_irq_disable ();while (1 )
@@ -101,6 +109,8 @@ int __init virt_parse_bootinfo(const struct bi_record *record)* length to prevent kexec from using it. */ memzero_explicit ((void *)data, len +2 ); +/* Store a reference to be filled in on reboot. */ + rng_seed_record = record;break ; }default :
Signature · 1 line
2.37.3
Geert Uytterhoeven
maintainerRe: [PATCH v3 2/3] m68k: virt: generate new RNG seed on reboot
Hi Jason,
Quoted 5 lines · Jason A. Donenfeld
Rather than rebooting into a system with no entropy, regenerate the RNG seed before rebooting, so that the new system has a fresh seed.
Fixes a1ee38ab1a75 ("m68k: virt: Use RNG seed from bootinfo block")Signed-off-by Jason A. Donenfeld <[email protected]>
Thanks for your patch!
I still doubt this is actually guaranteed to work, as the memory containing the bootinfo might be overwritten during normal operation.
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
Re: [PATCH v3 2/3] m68k: virt: generate new RNG seed on reboot
Quoted 6 lines · Geert Uytterhoeven
Hi Jason,
Quoted 3 lines · Jason A. Donenfeld
Rather than rebooting into a system with no entropy, regenerate the RNG seed before rebooting, so that the new system has a fresh seed.
Quoted 7 lines
Quoted 2 lines
Fixes a1ee38ab1a75 ("m68k: virt: Use RNG seed from bootinfo block")Signed-off-by Jason A. Donenfeld <[email protected]>Thanks for your patch!
I still doubt this is actually guaranteed to work, as the memory containing the bootinfo might be overwritten during normal operation.
Thus far, I'm unable to make it *not* work. So this seems like actually an improvement?
Jason
PATCH v3 3/3 m68k: rework BI_VIRT_RNG_SEED as BI_RNG_SEED
In reply to Jason A. DonenfeldThis is useful on !virt platforms for kexec, so change things from BI_VIRT_RNG_SEED to be BI_RNG_SEED, and simply remove BI_VIRT_RNG_SEED because it only ever lasted one release, and nothing is broken by not having it. At the same time, keep a comment noting that it's been removed, so that ID isn't reused.
--- arch/m68k/include/asm/bootinfo.h | 2 ++ arch/m68k/include/uapi/asm/bootinfo-virt.h | 9 ++------- arch/m68k/include/uapi/asm/bootinfo.h | 8 +++++++- arch/m68k/kernel/process.c | 10 ++++++++++ arch/m68k/kernel/setup_mm.c | 14 ++++++++++++++ arch/m68k/virt/config.c | 21 --------------------- 6 files changed, 35 insertions(+), 29 deletions(-)
arch/m68k/include/asm/bootinfo.h +2 -0
@@ -28,6 +28,8 @@ void process_uboot_commandline(char *commandp, int size);static inline void process_uboot_commandline (char *commandp,int size) {}#endif +extern const struct bi_record *rng_seed_record; +#endif /* __ASSEMBLY__ */
arch/m68k/include/uapi/asm/bootinfo-virt.h +2 -7
@@ -13,13 +13,8 @@#define BI_VIRT_VIRTIO_BASE 0x8004#define BI_VIRT_CTRL_BASE 0x8005 -/* -* A random seed used to initialize the RNG. Record format: -* -* - length [ 2 bytes, 16-bit big endian ] -* - seed data [ `length` bytes, padded to preserve 2-byte alignment ] -*/ -#define BI_VIRT_RNG_SEED 0x8006 +/* No longer used -- replaced with BI_RNG_SEED -- but don't reuse this index: +* #define BI_VIRT_RNG_SEED 0x8006 */ #define VIRT_BOOTI_VERSION MK_BI_VERSION(2, 0)
arch/m68k/include/uapi/asm/bootinfo.h +7 -1
@@ -64,7 +64,13 @@ struct mem_info {/* (struct mem_info) */ #define BI_COMMAND_LINE 0x0007/* kernel command line parameters */ /* (string) */ - +/* +* A random seed used to initialize the RNG. Record format: +* +* - length [ 2 bytes, 16-bit big endian ] +* - seed data [ `length` bytes, padded to preserve 2-byte alignment ] +*/ +#define BI_RNG_SEED 0x0008/* * Linux/m68k Architectures (BI_MACHTYPE)
arch/m68k/kernel/process.c +10 -0
@@ -29,6 +29,7 @@#include <linux/reboot.h> #include <linux/init_task.h> #include <linux/mqueue.h> +#include <linux/random.h> #include <linux/rcupdate.h> #include <linux/syscalls.h> #include <linux/uaccess.h>
@@ -36,6 +37,7 @@#include <asm/traps.h> #include <asm/machdep.h> #include <asm/setup.h> +#include <asm/bootinfo.h> asmlinkage void ret_from_fork(void);
@@ -51,8 +53,16 @@ void arch_cpu_idle(void)#endif } +const struct bi_record *rng_seed_record; +void machine_restart (char * __unused) { +if (rng_seed_record && rng_seed_record->size >sizeof (*rng_seed_record) +2 ) { +u16 len = rng_seed_record->size -sizeof (*rng_seed_record) -2 ; +get_random_bytes ((u8 *)rng_seed_record->data +2 , len); + *(u16 *)rng_seed_record->data =cpu_to_be16 (len); + } +if (mach_reset)mach_reset ();for (;;);
arch/m68k/kernel/setup_mm.c +14 -0
@@ -25,6 +25,7 @@#include <linux/module.h> #include <linux/nvram.h> #include <linux/initrd.h> +#include <linux/random.h> #include <asm/bootinfo.h> #include <asm/byteorder.h>
@@ -151,6 +152,19 @@ static void __init m68k_parse_bootinfo(const struct bi_record *record) sizeof(m68k_command_line));break ; +case BI_RNG_SEED : { +u16 len =be16_to_cpup (data); +add_bootloader_randomness (data +2 , len); +/* +* Zero the data to preserve forward secrecy, and zero the +* length to prevent kexec from using it. +*/ +memzero_explicit ((void *)data, len +2 ); +/* Store a reference to be filled in on reboot. */ + rng_seed_record = record; +break ; + } +default :if (MACH_IS_AMIGA ) unknown =amiga_parse_bootinfo (record);
arch/m68k/virt/config.c +0 -21
@@ -2,7 +2,6 @@#include <linux/reboot.h> #include <linux/serial_core.h> -#include <linux/random.h> #include <clocksource/timer-goldfish.h> #include <asm/bootinfo.h>
@@ -45,18 +44,10 @@ static void virt_halt(void) ; } -static const struct bi_record *rng_seed_record; -static void virt_reset (void ) {void __iomem *base = (void __iomem *)virt_bi_data.ctrl.mmio; -if (rng_seed_record && rng_seed_record->size >sizeof (*rng_seed_record) +2 ) { -u16 len = rng_seed_record->size -sizeof (*rng_seed_record) -2 ; -get_random_bytes ((u8 *)rng_seed_record->data +2 , len); - *(u16 *)rng_seed_record->data =cpu_to_be16 (len); - } -iowrite32be (CMD_RESET , base +VIRT_CTRL_REG_CMD );local_irq_disable ();while (1 )
@@ -101,18 +92,6 @@ int __init virt_parse_bootinfo(const struct bi_record *record) data +=4 ; virt_bi_data.virtio.irq =be32_to_cpup (data);break ; -case BI_VIRT_RNG_SEED : { -u16 len =be16_to_cpup (data); -add_bootloader_randomness (data +2 , len); -/* -* Zero the data to preserve forward secrecy, and zero the -* length to prevent kexec from using it. -*/ -memzero_explicit ((void *)data, len +2 ); -/* Store a reference to be filled in on reboot. */ - rng_seed_record = record; -break ; - }default : unknown =1 ;break ;
Signature · 1 line
2.37.3
Geert Uytterhoeven
maintainerRe: [PATCH v3 3/3] m68k: rework BI_VIRT_RNG_SEED as BI_RNG_SEED
Hi Jason,
Quoted 9 lines · Jason A. Donenfeld
This is useful on !virt platforms for kexec, so change things from
BI_VIRT_RNG_SEEDto beBI_RNG_SEED, and simply removeBI_VIRT_RNG_SEEDbecause it only ever lasted one release, and nothing is broken by not having it. At the same time, keep a comment noting that it's been removed, so that ID isn't reused.Suggested-by Geert Uytterhoeven <[email protected]>Cc Laurent Vivier <[email protected]>Signed-off-by Jason A. Donenfeld <[email protected]>
The approach LGTM, but given my doubts on [PATCH v3 2/3], I think this patch should be moved up, to not depend on [2/3].
Quoted 5 lines
arch/m68k/include/uapi/asm/bootinfo-virt.h +0
-0@@ -13,13 +13,8 @@#define BI_VIRT_VIRTIO_BASE 0x8004#define BI_VIRT_CTRL_BASE 0x8005
arch/m68k/include/uapi/asm/bootinfo-virt.h line 17
Quoted 10 lines
arch/m68k/include/uapi/asm/bootinfo-virt.h +2
-7-/* -* A random seed used to initialize the RNG. Record format: -* -* - length [ 2 bytes, 16-bit big endian ] -* - seed data [ `length` bytes, padded to preserve 2-byte alignment ] -*/ -#define BI_VIRT_RNG_SEED 0x8006 +/* No longer used -- replaced with BI_RNG_SEED -- but don't reuse this index: +* #define BI_VIRT_RNG_SEED 0x8006 */
Please drop the space before TAB.
arch/m68k/include/uapi/asm/bootinfo.h struct mem_info { · line 71
Quoted 12 lines
arch/m68k/include/uapi/asm/bootinfo.h +5
-1@@ -64,7 +64,13 @@ struct mem_info {/* (struct mem_info) */ #define BI_COMMAND_LINE 0x0007/* kernel command line parameters */ /* (string) */ - +/* +* A random seed used to initialize the RNG. Record format: +* +* - length [ 2 bytes, 16-bit big endian ] +* - seed data [ `length` bytes, padded to preserve 2-byte alignment ]
While experimenting, I noticed this must actually be a 4-byte alignment, as data[] is an integral multiple of __be32 words:
struct bi_record {
__be16 tag; /* tag ID */
__be16 size; /* size of record (in bytes) */
__be32 data[]; /* data */
};m68kboot[1] and kexec-boot[2] do implement the correct rounding, but qemu's BOOTINFOSTR()[3] and BOOTINFODATA()[4] do not. Sorry for missing that before, I guess I was misled by the existing bug in BOOTINFOSTR().
Consequently, both kexec-tools[5] and the m68k-bootinfo tool[6] cannot parse /proc/bootinfo if the size is not a multiple of 4, which can easily be triggered by changing the command line of the m68k virt machine.
arch/m68k/include/uapi/asm/bootinfo.h struct mem_info { · line 76
Quoted 5 lines
arch/m68k/include/uapi/asm/bootinfo.h +2
-0+*/ +#define BI_RNG_SEED 0x0008/* * Linux/m68k Architectures (BI_MACHTYPE)
[1] https://github.com/geertu/m68kboot/blob/master/common/bootinf.c#L171
[2] https://git.kernel.org/pub/scm/utils/kernel/kexec/kexec-tools.git/tree/kexec/arch/m68k/bootinfo.c#n60
[3] https://git.qemu.org/?p=qemu.git;a=blob;f=hw/m68k/bootinfo.h;h=bd8b212fd35ce216917e07eb67783b5b69f1e11b;hb=HEAD#l57
[4] https://git.qemu.org/?p=qemu.git;a=blob;f=hw/m68k/bootinfo.h;h=bd8b212fd35ce216917e07eb67783b5b69f1e11b;hb=HEAD#l73
[5] https://git.kernel.org/pub/scm/utils/kernel/kexec/kexec-tools.git/tree/kexec/arch/m68k/bootinfo.c#n106
[6] https://github.com/geertu/m68k-bootinfo/blob/master/m68k-bootinfo.c#L466
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
Re: [PATCH v3 3/3] m68k: rework BI_VIRT_RNG_SEED as BI_RNG_SEED
Hi Geert,
Quoted 2 lines · Geert Uytterhoeven
The approach LGTM, but given my doubts on [PATCH v3 2/3], I think this patch should be moved up, to not depend on [2/3].
I'll do that. But also, I'm not sure I yet agree with you about 2/3, so we should keep discussing that. (I'll still move it to 3/3 though.)
Quoted 5 lines
arch/m68k/include/uapi/asm/bootinfo-virt.h line 17
Quoted 3 lines
arch/m68k/include/uapi/asm/bootinfo-virt.h +2
-1-#define BI_VIRT_RNG_SEED 0x8006 +/* No longer used -- replaced with BI_RNG_SEED -- but don't reuse this index: +* #define BI_VIRT_RNG_SEED 0x8006 */ Please drop the space before TAB.
Ack.
Quoted 28 lines
arch/m68k/include/uapi/asm/bootinfo.h struct mem_info { · line 71
Quoted 13 lines
arch/m68k/include/uapi/asm/bootinfo.h +5
-1@@ -64,7 +64,13 @@ struct mem_info {/* (struct mem_info) */ #define BI_COMMAND_LINE 0x0007/* kernel command line parameters */ /* (string) */ - +/* +* A random seed used to initialize the RNG. Record format: +* +* - length [ 2 bytes, 16-bit big endian ] +* - seed data [ `length` bytes, padded to preserve 2-byte alignment ] While experimenting, I noticed this must actually be a 4-byte alignment, as data[] is an integral multiple of
__be32words:struct bi_record { __be16 tag; /* tag ID */ __be16 size; /* size of record (in bytes) */ __be32 data[]; /* data */ };m68kboot[1] and kexec-boot[2] do implement the correct rounding, but qemu's BOOTINFOSTR()[3] and BOOTINFODATA()[4] do not. Sorry for missing that before, I guess I was misled by the existing bug in
BOOTINFOSTR().
Quoted 4 lines
Consequently, both kexec-tools[5] and the m68k-bootinfo tool[6] cannot parse
/proc/bootinfoif the size is not a multiple of 4, which can easily be triggered by changing the command line of the m68k virt machine.
In my brief experience in working with this structure, I've just made sure that data[] is casted to (void*) or (u8*) or something, and then everything is fine. But the tools you've linked to expect 4 byte alignment. So, it sounds like what you're saying is that while we're at it with fixing the constant, I should also make sure seed data preserves 4 byte alignment, and update the comment too? That's easy enough. I'll do that for v+1.
Jason
Re: [PATCH v3 3/3] m68k: rework BI_VIRT_RNG_SEED as BI_RNG_SEED
Okay v4 on its way now. Also updating the qemu patch to fix the bug you found.
Quoted 8 lines · Jason A. Donenfeld
The RNG seed boot record is memzeroed after processing, in order to preserve forward secrecy. By saving the bootinfo for procfs prior to that, forward secrecy is violated, since it becomes possible to recover past states. So, save the bootinfo block only after first processing them.
Fixes a1ee38ab1a75 ("m68k: virt: Use RNG seed from bootinfo block")Signed-off-by Jason A. Donenfeld <[email protected]>
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
Hi Geert,
Quoted 11 lines · Geert Uytterhoeven
Quoted 8 lines · Jason A. Donenfeld
The RNG seed boot record is memzeroed after processing, in order to preserve forward secrecy. By saving the bootinfo for procfs prior to that, forward secrecy is violated, since it becomes possible to recover past states. So, save the bootinfo block only after first processing them.
Fixes a1ee38ab1a75 ("m68k: virt: Use RNG seed from bootinfo block")Signed-off-by Jason A. Donenfeld <[email protected]>Reviewed-by Geert Uytterhoeven <[email protected]>
Thanks for the review.
Did you intend to take these 3 patches through your m68k tree, or did you want me to take them for some reason instead?
Jason
Geert Uytterhoeven
maintainerHi Jason,
Quoted 11 lines · Jason A. Donenfeld
Quoted 10 lines · Geert Uytterhoeven
Quoted 8 lines · Jason A. Donenfeld
The RNG seed boot record is memzeroed after processing, in order to preserve forward secrecy. By saving the bootinfo for procfs prior to that, forward secrecy is violated, since it becomes possible to recover past states. So, save the bootinfo block only after first processing them.
Fixes a1ee38ab1a75 ("m68k: virt: Use RNG seed from bootinfo block")Signed-off-by Jason A. Donenfeld <[email protected]>
Quoted 6 lines
Quoted 1 line
Reviewed-by Geert Uytterhoeven <[email protected]>Thanks for the review.
Did you intend to take these 3 patches through your m68k tree, or did you want me to take them for some reason instead?
This is all TBD, see the comments I'm writing on the other patches ;-)
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