automatically add /chosen/kaslr-seed and deduplicate code
v7 cover automatically add /chosen/kaslr-seed and deduplicate code
This series will automatically add /chosen/kaslr-seed to the dt if DM_RNG is enabled
during the boot process.
If RANDOMIZE_BASE is enabled in the Linux kernel instructing it to randomize the virtual address at which the kernel image is loaded, it expects entropy to be provided by the bootloader by populating /chosen/kaslr-seed with a 64-bit value from source of entropy at boot.
If we have DM_RNG enabled populate this value automatically when fdt_chosen is called. We skip this if ARMV8_SEC_FIRMWARE_SUPPORT is enabled as its implementation uses a different source of entropy that is not yet implemented as DM_RNG. We also skip this if MEASURED_BOOT is enabled as in that case any modifications to the dt will cause measured boot to fail (although there are many other places the dt is altered).
As this fdt node is added elsewhere create a library function and use it to deduplicate code. We will provide a parameter to overwrite the node if present.
For our automatic injection, we will use the first rng device and not overwrite if already present with a non-zero value (which may have been populated by an earlier boot stage). This way if a board specific ft_board_setup() function wants to customize this behavior it can call fdt_kaslrseed with a rng device index of its choosing and set overwrite true.
Note that the kalsrseed command (CMD_KASLRSEED) is likely pointless now but left in place in case boot scripts exist that rely on this command existing and returning success. An informational message is printed to alert users of this command that it is likely no longer needed.
Note that the Kernel's EFI STUB only relies on EFI_RNG_PROTOCOL for randomization and completely ignores the kaslr-seed for its own randomness needs (i.e the randomization of the physical placement of the kernel). It gets weeded out from the DTB that gets handed over via efi_install_fdt() as it would also mess up the measured boot DTB TPM measurements as well.
v7:
- fix fdt_test_chosen to not expect kaslr-seed for CONFIG_MEASURED_BOOT and CONFIG_ARMV8_SEC_FIRMWARE_SUPPORT
v6:
- collected tags
- add patch to fdt ut
v5:
- fixed typo in commit message s/it's/its/
- use cmd_process_error per Michal's suggestion
- split into separate patches
- remove the rng device index noting it as a future enhancement
v4:
- add missing /n to notice in kaslrseed cmd
- combine ints in declaration
- remove unused vars from board/xilinx/common/board.c ft_board_setup
v3:
- skip if CONFIG_MEASURED_BOOT
- fix skip for CONFIG_ARMV8_SEC_FIRMWARE_SUPPORT
- pass in rng index and bool to specify overwrite
- remove duplicate error strings printed outside of fdt_kaslrseed
- added note to commit log about how EFI STUB weeds out kalsr-seed
v2:
- fix typo in commit msg
- use stack for seed to avoid unecessary malloc/free
- move to a library function and deduplicate code by using it elsewhere
Tim Harvey (4):
Add fdt_kaslrseed function to add kaslr-seed to chosen node
fdt: automatically add /chosen/kaslr-seed if DM_RNG is enabled use fdt_kaslrseed function to de-duplicate code
test: cmd: fdt: fix chosen test for DM_RNG
board/xilinx/common/board.c | 40 ---------------------------- boot/fdt_support.c | 53 +++++++++++++++++++++++++++++++++++++ boot/pxe_utils.c | 34 +----------------------- cmd/kaslrseed.c | 49 +++++----------------------------- include/fdt_support.h | 10 +++++++ test/cmd/fdt.c | 8 ++++++ 6 files changed, 79 insertions(+), 115 deletions(-)
Signature · 1 line
2.25.1
PATCH v7 1/4 Add fdt_kaslrseed function to add kaslr-seed to chosen node
If RANDOMIZE_BASE is enabled in the Linux kernel instructing it to randomize the virtual address at which the kernel image is loaded, it expects entropy to be provided by the bootloader by populating /chosen/kaslr-seed with a 64-bit value from source of entropy at boot.
Add a fdt_kaslrseed function to accommodate this allowing an existing node to be overwritten if present. For now use the first rng device but it would be good to enhance this in the future to allow some sort of selection or policy in choosing the rng device used.
---
v6:
- collected tags
v5:
- move function to boot/fdt_support.c
- remove ability to select rng index and note in the commit log something like this as a future enhancement.
- fixed typo in commit message s/it's/its/
- use cmd_process_error per Michal's suggestion
v4:
- add missing /n to notice in kaslrseed cmd
- combine ints in declaration
- remove unused vars from board/xilinx/common/board.c ft_board_setup
v3:
- skip if CONFIG_MEASURED_BOOT
- fix skip for CONFIG_ARMV8_SEC_FIRMWARE_SUPPORT
- pass in rng index and bool to specify overwrite
- remove duplicate error strings printed outside of fdt_kaslrseed
- added note to commit log about how EFI STUB weeds out kalsr-seed
v2:
- fix typo in commit msg
- use stack for seed to avoid unecessary malloc/free
- move to a library function and deduplicate code by using it elsewhere
--- boot/fdt_support.c | 44 +++++++++++++++++++++++++++++++++++++++++++ include/fdt_support.h | 10 ++++++++++ 2 files changed, 54 insertions(+)
boot/fdt_support.c +44 -0
@@ -7,12 +7,15 @@*/ #include <common.h> +#include <dm.h> #include <abuf.h> #include <env.h> #include <log.h> #include <mapmem.h> #include <net.h> +#include <rng.h> #include <stdio_dev.h> +#include <dm/device_compat.h> #include <dm/ofnode.h> #include <linux/ctype.h> #include <linux/types.h>
@@ -274,6 +277,47 @@ int fdt_initrd(void *fdt, ulong initrd_start, ulong initrd_end)return 0 ; } +int fdt_kaslrseed (void *fdt,bool overwrite) +{ +int len, err, nodeoffset; +struct udevice *dev; +const u64 *orig; +u64 data =0 ; + + err =fdt_check_header (fdt); +if (err <0 ) +return err; + +/* find or create "/chosen" node. */ + nodeoffset =fdt_find_or_add_subnode (fdt,0 ,"chosen" ); +if (nodeoffset <0 ) +return nodeoffset; + +/* return without error if we are not overwriting and existing non-zero node */ + orig =fdt_getprop (fdt, nodeoffset,"kaslr-seed" , &len); +if (orig && len ==sizeof (*orig)) + data =fdt64_to_cpu (*orig); +if (data && !overwrite) { +debug ("not overwriting existing kaslr-seed\n" ); +return 0 ; + } + err =uclass_get_device (UCLASS_RNG ,0 , &dev); +if (err) { +printf ("No RNG device\n" ); +return err; + } + err =dm_rng_read (dev, &data,sizeof (data)); +if (err) { +dev_err (dev,"dm_rng_read failed: %d\n" , err); +return err; + } + err =fdt_setprop (fdt, nodeoffset,"kaslr-seed" , &data,sizeof (data)); +if (err <0 ) +printf ("WARNING: could not set kaslr-seed %s.\n" ,fdt_strerror (err)); + +return err; +} +/** * board_fdt_chosen_bootargs - boards may override this function to use * alternative kernel command line arguments
include/fdt_support.h +10 -0
@@ -463,4 +463,14 @@ void fdt_fixup_board_enet(void *blob);#ifdef CONFIG_CMD_PSTORE void fdt_fixup_pstore (void *blob);#endif + +/** +* fdt_kaslrseed() - create a 'kaslr-seed' node in chosen +* +* @blob: fdt blob +* @overwrite: do not overwrite existing non-zero node unless true +* Return: 0 if OK, -ve on error +*/ +int fdt_kaslrseed (void *blob,bool overwrite); +#endif /* ifndef __FDT_SUPPORT_H */
Signature · 1 line
2.25.1
Re: [PATCH v7 1/4] Add fdt_kaslrseed function to add kaslr-seed to chosen node
Hi Tim,
Quoted 78 lines · Tim Harvey
If
RANDOMIZE_BASEis enabled in the Linux kernel instructing it to randomize the virtual address at which the kernel image is loaded, it expects entropy to be provided by the bootloader by populating /chosen/kaslr-seed with a 64-bit value from source of entropy at boot.Add a
fdt_kaslrseedfunction to accommodate this allowing an existing node to be overwritten if present. For now use the first rng device but it would be good to enhance this in the future to allow some sort of selection or policy in choosing the rng device used.Signed-off-by Tim Harvey <[email protected]>Reviewed-by Simon Glass <[email protected]>Cc Michal Simek <[email protected]>Cc Andy Yan <[email protected]>Cc Akash Gajjar <[email protected]>Cc Ilias Apalodimas <[email protected]>Cc Simon Glass <[email protected]>Cc Patrick Delaunay <[email protected]>Cc Patrice Chotard <[email protected]>Cc Devarsh Thakkar <[email protected]>Cc Heinrich Schuchardt <[email protected]>Cc Hugo Villeneuve <[email protected]>Cc Marek Vasut <[email protected]>Cc Tom Rini <[email protected]>Cc Chris Morgan <[email protected]>---
v6:
- collected tags
v5:
- move function toboot/fdt_support.c
- remove ability to select rng index and note in the commit log something like this as a future enhancement.
- fixed typo in commit message s/it's/its/
- usecmd_process_errorper Michal's suggestion
v4:
- add missing /n to notice in kaslrseed cmd
- combine ints in declaration
- remove unused vars fromboard/xilinx/common/board.cft_board_setup
v3:
- skip ifCONFIG_MEASURED_BOOT
- fix skip forCONFIG_ARMV8_SEC_FIRMWARE_SUPPORT
- pass in rng index and bool to specify overwrite
- remove duplicate error strings printed outside offdt_kaslrseed
- added note to commit log about how EFI STUB weeds out kalsr-seed
v2:
- fix typo in commit msg
- use stack for seed to avoid unecessary malloc/free
- move to a library function and deduplicate code by using it elsewhere--- boot/fdt_support.c | 44 +++++++++++++++++++++++++++++++++++++++++++ include/fdt_support.h | 10 ++++++++++ 2 files changed, 54 insertions(+)boot/fdt_support.c +3
-0@@ -7,12 +7,15 @@*/ #include <common.h> +#include <dm.h> #include <abuf.h> #include <env.h> #include <log.h> #include <mapmem.h> #include <net.h> +#include <rng.h> #include <stdio_dev.h> +#include <dm/device_compat.h> #include <dm/ofnode.h> #include <linux/ctype.h> #include <linux/types.h> @@ -274,6 +277,47 @@ int fdt_initrd(void *fdt, ulong initrd_start, ulong initrd_end)return 0 ; }
boot/fdt_support.c int fdt_initrd(void *fdt, ulong initrd_start, ulong initrd_end) · line 289
Quoted 10 lines
boot/fdt_support.c +10
-0+int fdt_kaslrseed (void *fdt,bool overwrite) +{ +int len, err, nodeoffset; +struct udevice *dev; +const u64 *orig; +u64 data =0 ; + + err =fdt_check_header (fdt); +if (err <0 ) +return err;
All the paths that call fdt_kaslrseed() call fdt_check_header() beforehand, I think it's safe to drop this.
boot/fdt_support.c int fdt_initrd(void *fdt, ulong initrd_start, ulong initrd_end) · line 294
Quoted 5 lines
boot/fdt_support.c +5
-0+ +/* find or create "/chosen" node. */ + nodeoffset =fdt_find_or_add_subnode (fdt,0 ,"chosen" ); +if (nodeoffset <0 ) +return nodeoffset;
Arguably, this shouldn't be the responsibility of this function, maybe it would be better to error our here?
Quoted 48 lines
boot/fdt_support.c +26
-0+ +/* return without error if we are not overwriting and existing non-zero node */ + orig =fdt_getprop (fdt, nodeoffset,"kaslr-seed" , &len); +if (orig && len ==sizeof (*orig)) + data =fdt64_to_cpu (*orig); +if (data && !overwrite) { +debug ("not overwriting existing kaslr-seed\n" ); +return 0 ; + } + err =uclass_get_device (UCLASS_RNG ,0 , &dev); +if (err) { +printf ("No RNG device\n" ); +return err; + } + err =dm_rng_read (dev, &data,sizeof (data)); +if (err) { +dev_err (dev,"dm_rng_read failed: %d\n" , err); +return err; + } + err =fdt_setprop (fdt, nodeoffset,"kaslr-seed" , &data,sizeof (data)); +if (err <0 ) +printf ("WARNING: could not set kaslr-seed %s.\n" ,fdt_strerror (err)); + +return err; +} +/** * board_fdt_chosen_bootargs - boards may override this function to use * alternative kernel command line arguments include/fdt_support.h +10
-0@@ -463,4 +463,14 @@ void fdt_fixup_board_enet(void *blob);#ifdef CONFIG_CMD_PSTORE void fdt_fixup_pstore (void *blob);#endif + +/** +* fdt_kaslrseed() - create a 'kaslr-seed' node in chosen +* +* @blob: fdt blob +* @overwrite: do not overwrite existing non-zero node unless true +* Return: 0 if OK, -ve on error +*/ +int fdt_kaslrseed (void *blob,bool overwrite); +#endif /* ifndef __FDT_SUPPORT_H */
Signature · 1 line
// Caleb (they/them)
Re: [PATCH v7 1/4] Add fdt_kaslrseed function to add kaslr-seed to chosen node
Quoted 82 lines · Caleb Connolly
Hi Tim,
Quoted 78 lines · Tim Harvey
If
RANDOMIZE_BASEis enabled in the Linux kernel instructing it to randomize the virtual address at which the kernel image is loaded, it expects entropy to be provided by the bootloader by populating /chosen/kaslr-seed with a 64-bit value from source of entropy at boot.Add a
fdt_kaslrseedfunction to accommodate this allowing an existing node to be overwritten if present. For now use the first rng device but it would be good to enhance this in the future to allow some sort of selection or policy in choosing the rng device used.Signed-off-by Tim Harvey <[email protected]>Reviewed-by Simon Glass <[email protected]>Cc Michal Simek <[email protected]>Cc Andy Yan <[email protected]>Cc Akash Gajjar <[email protected]>Cc Ilias Apalodimas <[email protected]>Cc Simon Glass <[email protected]>Cc Patrick Delaunay <[email protected]>Cc Patrice Chotard <[email protected]>Cc Devarsh Thakkar <[email protected]>Cc Heinrich Schuchardt <[email protected]>Cc Hugo Villeneuve <[email protected]>Cc Marek Vasut <[email protected]>Cc Tom Rini <[email protected]>Cc Chris Morgan <[email protected]>---
v6:
- collected tags
v5:
- move function toboot/fdt_support.c
- remove ability to select rng index and note in the commit log something like this as a future enhancement.
- fixed typo in commit message s/it's/its/
- usecmd_process_errorper Michal's suggestion
v4:
- add missing /n to notice in kaslrseed cmd
- combine ints in declaration
- remove unused vars fromboard/xilinx/common/board.cft_board_setup
v3:
- skip ifCONFIG_MEASURED_BOOT
- fix skip forCONFIG_ARMV8_SEC_FIRMWARE_SUPPORT
- pass in rng index and bool to specify overwrite
- remove duplicate error strings printed outside offdt_kaslrseed
- added note to commit log about how EFI STUB weeds out kalsr-seed
v2:
- fix typo in commit msg
- use stack for seed to avoid unecessary malloc/free
- move to a library function and deduplicate code by using it elsewhere--- boot/fdt_support.c | 44 +++++++++++++++++++++++++++++++++++++++++++ include/fdt_support.h | 10 ++++++++++ 2 files changed, 54 insertions(+)boot/fdt_support.c +3
-0@@ -7,12 +7,15 @@*/ #include <common.h> +#include <dm.h> #include <abuf.h> #include <env.h> #include <log.h> #include <mapmem.h> #include <net.h> +#include <rng.h> #include <stdio_dev.h> +#include <dm/device_compat.h> #include <dm/ofnode.h> #include <linux/ctype.h> #include <linux/types.h> @@ -274,6 +277,47 @@ int fdt_initrd(void *fdt, ulong initrd_start, ulong initrd_end)return 0 ; }
Quoted 13 lines
boot/fdt_support.c int fdt_initrd(void *fdt, ulong initrd_start, ulong initrd_end) · line 289
Quoted 10 lines
boot/fdt_support.c +10
-0+int fdt_kaslrseed (void *fdt,bool overwrite) +{ +int len, err, nodeoffset; +struct udevice *dev; +const u64 *orig; +u64 data =0 ; + + err =fdt_check_header (fdt); +if (err <0 ) +return err;All the paths that call
fdt_kaslrseed()callfdt_check_header()beforehand, I think it's safe to drop this.
Hi Caleb,
The do_kaslr_seed path does not check for this and instead passes working_fdt - perhaps your point is still valid if working_fdt is guaranteed to always be a valid fdt?
Quoted 8 lines
boot/fdt_support.c int fdt_initrd(void *fdt, ulong initrd_start, ulong initrd_end) · line 294
Quoted 5 lines
boot/fdt_support.c +5
-0+ +/* find or create "/chosen" node. */ + nodeoffset =fdt_find_or_add_subnode (fdt,0 ,"chosen" ); +if (nodeoffset <0 ) +return nodeoffset;Arguably, this shouldn't be the responsibility of this function, maybe it would be better to error our here?
I'm not sure what your point is here... it is erroring out.
Best Regards,
Tim
Quoted 51 lines
Quoted 38 lines
boot/fdt_support.c +26
-0+ +/* return without error if we are not overwriting and existing non-zero node */ + orig =fdt_getprop (fdt, nodeoffset,"kaslr-seed" , &len); +if (orig && len ==sizeof (*orig)) + data =fdt64_to_cpu (*orig); +if (data && !overwrite) { +debug ("not overwriting existing kaslr-seed\n" ); +return 0 ; + } + err =uclass_get_device (UCLASS_RNG ,0 , &dev); +if (err) { +printf ("No RNG device\n" ); +return err; + } + err =dm_rng_read (dev, &data,sizeof (data)); +if (err) { +dev_err (dev,"dm_rng_read failed: %d\n" , err); +return err; + } + err =fdt_setprop (fdt, nodeoffset,"kaslr-seed" , &data,sizeof (data)); +if (err <0 ) +printf ("WARNING: could not set kaslr-seed %s.\n" ,fdt_strerror (err)); + +return err; +} +/** * board_fdt_chosen_bootargs - boards may override this function to use * alternative kernel command line arguments include/fdt_support.h +1
-0@@ -463,4 +463,14 @@ void fdt_fixup_board_enet(void *blob);#ifdef CONFIG_CMD_PSTORE void fdt_fixup_pstore (void *blob);#endif +include/fdt_support.h void fdt_fixup_board_enet(void *blob); · line 476
Quoted 10 lines
include/fdt_support.h +9
-0+/** +* fdt_kaslrseed() - create a 'kaslr-seed' node in chosen +* +* @blob: fdt blob +* @overwrite: do not overwrite existing non-zero node unless true +* Return: 0 if OK, -ve on error +*/ +int fdt_kaslrseed (void *blob,bool overwrite); +#endif /* ifndef __FDT_SUPPORT_H */ --
// Caleb (they/them)
Caleb Connolly
Reviewed-byRe: [PATCH v7 1/4] Add fdt_kaslrseed function to add kaslr-seed to chosen node
Quoted 110 lines · Tim Harvey
Quoted 82 lines · Caleb Connolly
Hi Tim,
Quoted 78 lines · Tim Harvey
If
RANDOMIZE_BASEis enabled in the Linux kernel instructing it to randomize the virtual address at which the kernel image is loaded, it expects entropy to be provided by the bootloader by populating /chosen/kaslr-seed with a 64-bit value from source of entropy at boot.Add a
fdt_kaslrseedfunction to accommodate this allowing an existing node to be overwritten if present. For now use the first rng device but it would be good to enhance this in the future to allow some sort of selection or policy in choosing the rng device used.Signed-off-by Tim Harvey <[email protected]>Reviewed-by Simon Glass <[email protected]>Cc Michal Simek <[email protected]>Cc Andy Yan <[email protected]>Cc Akash Gajjar <[email protected]>Cc Ilias Apalodimas <[email protected]>Cc Simon Glass <[email protected]>Cc Patrick Delaunay <[email protected]>Cc Patrice Chotard <[email protected]>Cc Devarsh Thakkar <[email protected]>Cc Heinrich Schuchardt <[email protected]>Cc Hugo Villeneuve <[email protected]>Cc Marek Vasut <[email protected]>Cc Tom Rini <[email protected]>Cc Chris Morgan <[email protected]>---
v6:
- collected tags
v5:
- move function toboot/fdt_support.c
- remove ability to select rng index and note in the commit log something like this as a future enhancement.
- fixed typo in commit message s/it's/its/
- usecmd_process_errorper Michal's suggestion
v4:
- add missing /n to notice in kaslrseed cmd
- combine ints in declaration
- remove unused vars fromboard/xilinx/common/board.cft_board_setup
v3:
- skip ifCONFIG_MEASURED_BOOT
- fix skip forCONFIG_ARMV8_SEC_FIRMWARE_SUPPORT
- pass in rng index and bool to specify overwrite
- remove duplicate error strings printed outside offdt_kaslrseed
- added note to commit log about how EFI STUB weeds out kalsr-seed
v2:
- fix typo in commit msg
- use stack for seed to avoid unecessary malloc/free
- move to a library function and deduplicate code by using it elsewhere--- boot/fdt_support.c | 44 +++++++++++++++++++++++++++++++++++++++++++ include/fdt_support.h | 10 ++++++++++ 2 files changed, 54 insertions(+)boot/fdt_support.c +3
-0@@ -7,12 +7,15 @@*/ #include <common.h> +#include <dm.h> #include <abuf.h> #include <env.h> #include <log.h> #include <mapmem.h> #include <net.h> +#include <rng.h> #include <stdio_dev.h> +#include <dm/device_compat.h> #include <dm/ofnode.h> #include <linux/ctype.h> #include <linux/types.h> @@ -274,6 +277,47 @@ int fdt_initrd(void *fdt, ulong initrd_start, ulong initrd_end)return 0 ; }Quoted 13 lines
boot/fdt_support.c int fdt_initrd(void *fdt, ulong initrd_start, ulong initrd_end) · line 289
Quoted 10 lines
boot/fdt_support.c +10
-0+int fdt_kaslrseed (void *fdt,bool overwrite) +{ +int len, err, nodeoffset; +struct udevice *dev; +const u64 *orig; +u64 data =0 ; + + err =fdt_check_header (fdt); +if (err <0 ) +return err;All the paths that call
fdt_kaslrseed()callfdt_check_header()beforehand, I think it's safe to drop this.Hi Caleb,
The
do_kaslr_seedpath does not check for this and instead passesworking_fdt- perhaps your point is still valid ifworking_fdtis guaranteed to always be a valid fdt?Quoted 6 lines
Quoted 5 lines
boot/fdt_support.c +5
-0+ +/* find or create "/chosen" node. */ + nodeoffset =fdt_find_or_add_subnode (fdt,0 ,"chosen" ); +if (nodeoffset <0 ) +return nodeoffset;
Quoted 4 lines
Quoted 2 lines
Arguably, this shouldn't be the responsibility of this function, maybe it would be better to error our here?
I'm not sure what your point is here... it is erroring out.
Hi Tim,
On a re-read, I'm honestly not sure what I was getting at here. I was under the impression that were were doing fdt_check_header() multiple times on the same fdt, but if that's not the case then this is of course fine.
Regarding the chosen node, clearly something went amiss between brain and keyboard there.
Sorry if I delayed this patch series! Looking forward to having it in.
Thanks and regards,
Quoted 56 lines
Best Regards,
Tim
Quoted 51 lines
Quoted 38 lines
boot/fdt_support.c +26
-0+ +/* return without error if we are not overwriting and existing non-zero node */ + orig =fdt_getprop (fdt, nodeoffset,"kaslr-seed" , &len); +if (orig && len ==sizeof (*orig)) + data =fdt64_to_cpu (*orig); +if (data && !overwrite) { +debug ("not overwriting existing kaslr-seed\n" ); +return 0 ; + } + err =uclass_get_device (UCLASS_RNG ,0 , &dev); +if (err) { +printf ("No RNG device\n" ); +return err; + } + err =dm_rng_read (dev, &data,sizeof (data)); +if (err) { +dev_err (dev,"dm_rng_read failed: %d\n" , err); +return err; + } + err =fdt_setprop (fdt, nodeoffset,"kaslr-seed" , &data,sizeof (data)); +if (err <0 ) +printf ("WARNING: could not set kaslr-seed %s.\n" ,fdt_strerror (err)); + +return err; +} +/** * board_fdt_chosen_bootargs - boards may override this function to use * alternative kernel command line arguments include/fdt_support.h +1
-0@@ -463,4 +463,14 @@ void fdt_fixup_board_enet(void *blob);#ifdef CONFIG_CMD_PSTORE void fdt_fixup_pstore (void *blob);#endif +include/fdt_support.h void fdt_fixup_board_enet(void *blob); · line 476
Quoted 10 lines
include/fdt_support.h +9
-0+/** +* fdt_kaslrseed() - create a 'kaslr-seed' node in chosen +* +* @blob: fdt blob +* @overwrite: do not overwrite existing non-zero node unless true +* Return: 0 if OK, -ve on error +*/ +int fdt_kaslrseed (void *blob,bool overwrite); +#endif /* ifndef __FDT_SUPPORT_H */ --
// Caleb (they/them)
Signature · 1 line
// Caleb (they/them)
PATCH v7 2/4 fdt: automatically add /chosen/kaslr-seed if DM_RNG is enabled
In reply to Tim HarveyIf RANDOMIZE_BASE is enabled in the Linux kernel instructing it to randomize the virtual address at which the kernel image is loaded, it expects entropy to be provided by the bootloader by populating /chosen/kaslr-seed with a 64-bit value from source of entropy at boot.
If we have DM_RNG enabled populate this value automatically when fdt_chosen is called. We skip this if ARMV8_SEC_FIRMWARE_SUPPORT is enabled as its implementation uses a different source of entropy that is not yet implemented as DM_RNG. We also skip this if MEASURED_BOOT is enabled as in that case any modifications to the dt will cause measured boot to fail (although there are many other places the dt is altered).
Note that the Kernel's EFI STUB only relies on EFI_RNG_PROTOCOL for randomization and completely ignores the kaslr-seed for its own randomness needs (i.e the randomization of the physical placement of the kernel). It gets weeded out from the DTB that gets handed over via efi_install_fdt() as it would also mess up the measured boot DTB TPM measurements as well.
---
v6:
- collected tags
v5:
- fixed typo in commit message s/it's/its/
- split patch into 3 parts
v4:
- add missing /n to notice in kaslrseed cmd
- combine ints in declaration
- remove unused vars from board/xilinx/common/board.c ft_board_setup
v3:
- skip if CONFIG_MEASURED_BOOT
- fix skip for CONFIG_ARMV8_SEC_FIRMWARE_SUPPORT
- pass in rng index and bool to specify overwrite
- remove duplicate error strings printed outside of fdt_kaslrseed
- added note to commit log about how EFI STUB weeds out kalsr-seed
v2:
- fix typo in commit msg
- use stack for seed to avoid unecessary malloc/free
- move to a library function and deduplicate code by using it elsewhere
--- boot/fdt_support.c | 9 +++++++++ 1 file changed, 9 insertions(+)
boot/fdt_support.c +9 -0
@@ -345,6 +345,15 @@ int fdt_chosen(void *fdt)if (nodeoffset <0 )return nodeoffset; +/* if DM_RNG enabled automatically inject kaslr-seed node unless: +* CONFIG_MEASURED_BOOT enabled: as dt modifications break measured boot +* CONFIG_ARMV8_SEC_FIRMWARE_SUPPORT enabled: as that implementation does not use dm yet +*/ +if (IS_ENABLED (CONFIG_DM_RNG ) && + !IS_ENABLED (CONFIG_MEASURED_BOOT ) && + !IS_ENABLED (CONFIG_ARMV8_SEC_FIRMWARE_SUPPORT )) +fdt_kaslrseed (fdt, false); +if (IS_ENABLED (CONFIG_BOARD_RNG_SEED ) && !board_rng_seed (&buf)) { err =fdt_setprop (fdt, nodeoffset,"rng-seed" ,abuf_data (&buf),abuf_size (&buf));
Signature · 1 line
2.25.1
PATCH v7 3/4 use fdt_kaslrseed function to de-duplicate code
In reply to Tim HarveyUse the fdt_kaslrseed function to deduplicate code doing the same thing.
Note that the kalsrseed command (CMD_KASLRSEED) is likely pointless now but left in place in case boot scripts exist that rely on this command existing and returning success. An informational message is printed to alert users of this command that it is likely no longer needed.
Note that the Kernel's EFI STUB only relies on EFI_RNG_PROTOCOL for randomization and completely ignores the kaslr-seed for its own randomness needs (i.e the randomization of the physical placement of the kernel). It gets weeded out from the DTB that gets handed over via efi_install_fdt() as it would also mess up the measured boot DTB TPM measurements as well.
---
v6:
- collected tags
v5:
- fixed typo in commit message s/it's/its/
- use cmd_process_error per Michal's suggestion
v4:
- add missing /n to notice in kaslrseed cmd
- combine ints in declaration
- remove unused vars from board/xilinx/common/board.c ft_board_setup
v3:
- skip if CONFIG_MEASURED_BOOT
- fix skip for CONFIG_ARMV8_SEC_FIRMWARE_SUPPORT
- pass in rng index and bool to specify overwrite
- remove duplicate error strings printed outside of fdt_kaslrseed
- added note to commit log about how EFI STUB weeds out kalsr-seed
v2:
- fix typo in commit msg
- use stack for seed to avoid unecessary malloc/free
- move to a library function and deduplicate code by using it elsewhere
--- board/xilinx/common/board.c | 40 ------------------------------ boot/pxe_utils.c | 34 +------------------------ cmd/kaslrseed.c | 49 ++++++------------------------------- 3 files changed, 8 insertions(+), 115 deletions(-)
board/xilinx/common/board.c +0 -40
@@ -702,11 +702,6 @@ phys_addr_t board_get_usable_ram_top(phys_size_t total_size)#define MAX_RAND_SIZE 8int ft_board_setup (void *blob,struct bd_info *bd) { -size_t n =MAX_RAND_SIZE ; -struct udevice *dev; -u8 buf[MAX_RAND_SIZE ]; -int nodeoffset, ret; -static const struct node_info nodes[] = { {"arm,pl353-nand-r2p1" ,MTD_DEV_TYPE_NAND , }, };
@@ -714,41 +709,6 @@ int ft_board_setup(void *blob, struct bd_info *bd)if (IS_ENABLED (CONFIG_FDT_FIXUP_PARTITIONS ) &&IS_ENABLED (CONFIG_NAND_ZYNQ ))fdt_fixup_mtdparts (blob, nodes,ARRAY_SIZE (nodes)); -if (uclass_get_device (UCLASS_RNG ,0 , &dev) || !dev) { -debug ("No RNG device\n" ); -return 0 ; - } - -if (dm_rng_read (dev, buf, n)) { -debug ("Reading RNG failed\n" ); -return 0 ; - } - -if (!blob) { -debug ("No FDT memory address configured. Please configure\n" -"the FDT address via \"fdt addr <address>\" command.\n" -"Aborting!\n" ); -return 0 ; - } - - ret =fdt_check_header (blob); -if (ret <0 ) { -debug ("fdt_chosen: %s\n" ,fdt_strerror (ret)); -return ret; - } - - nodeoffset =fdt_find_or_add_subnode (blob,0 ,"chosen" ); -if (nodeoffset <0 ) { -debug ("Reading chosen node failed\n" ); -return nodeoffset; - } - - ret =fdt_setprop (blob, nodeoffset,"kaslr-seed" , buf,sizeof (buf)); -if (ret <0 ) { -debug ("Unable to set kaslr-seed on chosen node: %s\n" ,fdt_strerror (ret)); -return ret; - } - return 0; }#endif
boot/pxe_utils.c +1 -33
@@ -324,10 +324,6 @@ static void label_boot_kaslrseed(void)#if CONFIG_IS_ENABLED (DM_RNG )ulong fdt_addr;struct fdt_header *working_fdt; -size_t n =0x8 ; -struct udevice *dev; -u64 *buf; -int nodeoffset;int err;/* Get the main fdt and map it */
@@ -343,35 +339,7 @@ static void label_boot_kaslrseed(void)if (err <=0 )return ; -if (uclass_get_device (UCLASS_RNG ,0 , &dev) || !dev) { -printf ("No RNG device\n" ); -return ; - } - - nodeoffset =fdt_find_or_add_subnode (working_fdt,0 ,"chosen" ); -if (nodeoffset <0 ) { -printf ("Reading chosen node failed\n" ); -return ; - } - - buf =malloc (n); -if (!buf) { -printf ("Out of memory\n" ); -return ; - } - -if (dm_rng_read (dev, buf, n)) { -printf ("Reading RNG failed\n" ); - goto err; - } - - err =fdt_setprop (working_fdt, nodeoffset,"kaslr-seed" , buf,sizeof (buf)); -if (err <0 ) { -printf ("Unable to set kaslr-seed on chosen node: %s\n" ,fdt_strerror (err)); - goto err; - } -err: -free (buf); +fdt_kaslrseed (working_fdt, true);#endif return ; }
cmd/kaslrseed.c +7 -42
63 lines not on this page · raw message
Signature · 1 line
2.25.1
Re: [PATCH v7 3/4] use fdt_kaslrseed function to de-duplicate code
Quoted 224 lines · Tim Harvey
Use the
fdt_kaslrseedfunction to deduplicate code doing the same thing.Note that the kalsrseed command (
CMD_KASLRSEED) is likely pointless now but left in place in case boot scripts exist that rely on this command existing and returning success. An informational message is printed to alert users of this command that it is likely no longer needed.Note that the Kernel's EFI STUB only relies on
EFI_RNG_PROTOCOLfor randomization and completely ignores the kaslr-seed for its own randomness needs (i.e the randomization of the physical placement of the kernel). It gets weeded out from the DTB that gets handed over viaefi_install_fdt()as it would also mess up the measured boot DTB TPM measurements as well.Signed-off-by Tim Harvey <[email protected]>Reviewed-by Simon Glass <[email protected]>Cc Michal Simek <[email protected]>Cc Andy Yan <[email protected]>Cc Akash Gajjar <[email protected]>Cc Ilias Apalodimas <[email protected]>Cc Simon Glass <[email protected]>Cc Patrick Delaunay <[email protected]>Cc Patrice Chotard <[email protected]>Cc Devarsh Thakkar <[email protected]>Cc Heinrich Schuchardt <[email protected]>Cc Hugo Villeneuve <[email protected]>Cc Marek Vasut <[email protected]>Cc Tom Rini <[email protected]>Cc Chris Morgan <[email protected]>---
v6:
- collected tags
v5:
- fixed typo in commit message s/it's/its/
- usecmd_process_errorper Michal's suggestion
v4:
- add missing /n to notice in kaslrseed cmd
- combine ints in declaration
- remove unused vars fromboard/xilinx/common/board.cft_board_setup
v3:
- skip ifCONFIG_MEASURED_BOOT
- fix skip forCONFIG_ARMV8_SEC_FIRMWARE_SUPPORT
- pass in rng index and bool to specify overwrite
- remove duplicate error strings printed outside offdt_kaslrseed
- added note to commit log about how EFI STUB weeds out kalsr-seed
v2:
- fix typo in commit msg
- use stack for seed to avoid unecessary malloc/free
- move to a library function and deduplicate code by using it elsewhere--- board/xilinx/common/board.c | 40 ------------------------------ boot/pxe_utils.c | 34 +------------------------ cmd/kaslrseed.c | 49 ++++++------------------------------- 3 files changed, 8 insertions(+), 115 deletions(-)board/xilinx/common/board.c +0
-40@@ -702,11 +702,6 @@ phys_addr_t board_get_usable_ram_top(phys_size_t total_size)#define MAX_RAND_SIZE 8int ft_board_setup (void *blob,struct bd_info *bd) { -size_t n =MAX_RAND_SIZE ; -struct udevice *dev; -u8 buf[MAX_RAND_SIZE ]; -int nodeoffset, ret; -static const struct node_info nodes[] = { {"arm,pl353-nand-r2p1" ,MTD_DEV_TYPE_NAND , }, };@@ -714,41 +709,6 @@ int ft_board_setup(void *blob, struct bd_info *bd)if (IS_ENABLED (CONFIG_FDT_FIXUP_PARTITIONS ) &&IS_ENABLED (CONFIG_NAND_ZYNQ ))fdt_fixup_mtdparts (blob, nodes,ARRAY_SIZE (nodes)); -if (uclass_get_device (UCLASS_RNG ,0 , &dev) || !dev) { -debug ("No RNG device\n" ); -return 0 ; - } - -if (dm_rng_read (dev, buf, n)) { -debug ("Reading RNG failed\n" ); -return 0 ; - } - -if (!blob) { -debug ("No FDT memory address configured. Please configure\n" -"the FDT address via \"fdt addr <address>\" command.\n" -"Aborting!\n" ); -return 0 ; - } - - ret =fdt_check_header (blob); -if (ret <0 ) { -debug ("fdt_chosen: %s\n" ,fdt_strerror (ret)); -return ret; - } - - nodeoffset =fdt_find_or_add_subnode (blob,0 ,"chosen" ); -if (nodeoffset <0 ) { -debug ("Reading chosen node failed\n" ); -return nodeoffset; - } - - ret =fdt_setprop (blob, nodeoffset,"kaslr-seed" , buf,sizeof (buf)); -if (ret <0 ) { -debug ("Unable to set kaslr-seed on chosen node: %s\n" ,fdt_strerror (ret)); -return ret; - } - return 0; }#endif boot/pxe_utils.c +1
-33@@ -324,10 +324,6 @@ static void label_boot_kaslrseed(void)#if CONFIG_IS_ENABLED (DM_RNG )ulong fdt_addr;struct fdt_header *working_fdt; -size_t n =0x8 ; -struct udevice *dev; -u64 *buf; -int nodeoffset;int err;/* Get the main fdt and map it */ @@ -343,35 +339,7 @@ static void label_boot_kaslrseed(void)if (err <=0 )return ; -if (uclass_get_device (UCLASS_RNG ,0 , &dev) || !dev) { -printf ("No RNG device\n" ); -return ; - } - - nodeoffset =fdt_find_or_add_subnode (working_fdt,0 ,"chosen" ); -if (nodeoffset <0 ) { -printf ("Reading chosen node failed\n" ); -return ; - } - - buf =malloc (n); -if (!buf) { -printf ("Out of memory\n" ); -return ; - } - -if (dm_rng_read (dev, buf, n)) { -printf ("Reading RNG failed\n" ); - goto err; - } - - err =fdt_setprop (working_fdt, nodeoffset,"kaslr-seed" , buf,sizeof (buf)); -if (err <0 ) { -printf ("Unable to set kaslr-seed on chosen node: %s\n" ,fdt_strerror (err)); - goto err; - } -err: -free (buf); +fdt_kaslrseed (working_fdt, true);#endif return ; }cmd/kaslrseed.c +6
-36@@ -16,56 +16,21 @@static int do_kaslr_seed (struct cmd_tbl *cmdtp,int flag,int argc,char *const argv[]) { -size_t n =0x8 ; -struct udevice *dev; -u64 *buf; -int nodeoffset; -int ret =CMD_RET_SUCCESS ; +int err =CMD_RET_SUCCESS ; -if (uclass_get_device (UCLASS_RNG ,0 , &dev) || !dev) { -printf ("No RNG device\n" ); -return CMD_RET_FAILURE ; - } - - buf =malloc (n); -if (!buf) { -printf ("Out of memory\n" ); -return CMD_RET_FAILURE ; - } - -if (dm_rng_read (dev, buf, n)) { -printf ("Reading RNG failed\n" ); -return CMD_RET_FAILURE ; - } +printf ("Notice: a /chosen/kaslr-seed is automatically added to the device-tree when booted via booti/bootm/bootz therefore using this command is likely no longer needed\n" );if (!working_fdt) {printf ("No FDT memory address configured. Please configure\n" "the FDT address via \"fdt addr <address>\" command.\n" "Aborting!\n" ); -return CMD_RET_FAILURE ; - } - - ret =fdt_check_header (working_fdt); -if (ret <0 ) { -printf ("fdt_chosen: %s\n" ,fdt_strerror (ret)); -return CMD_RET_FAILURE ; - } - - nodeoffset =fdt_find_or_add_subnode (working_fdt,0 ,"chosen" ); -if (nodeoffset <0 ) { -printf ("Reading chosen node failed\n" ); -return CMD_RET_FAILURE ; + err =CMD_RET_FAILURE ; + }else { +if (fdt_kaslrseed (working_fdt, true) <0 ) + err =CMD_RET_FAILURE ; } - ret =fdt_setprop (working_fdt, nodeoffset,"kaslr-seed" , buf,sizeof (buf)); -if (ret <0 ) { -printf ("Unable to set kaslr-seed on chosen node: %s\n" ,fdt_strerror (ret));
cmd/kaslrseed.c line 36
Quoted 10 lines
cmd/kaslrseed.c +1
-6-return CMD_RET_FAILURE ; - } - -free (buf); - -return ret; +return cmd_process_error (cmdtp, err); } U_BOOT_LONGHELP(kaslrseed,
Thanks,
Michal
PATCH v7 4/4 test: cmd: fdt: fix chosen test for DM_RNG
In reply to Tim HarveyNow that kaslr-seed is automatically added to the chosen node if DM_RNG is enabled, adjust the test to expect this.
Take care not to expect kaslr-seed for CONFIG_MEASURED_BOOT and CONFIG_ARMV8_SEC_FIRMWARE_SUPPORT as we do not add it for those.
---
v7: fix fdt_test_chosen to not expect kaslr-seed for
CONFIG_MEASURED_BOOT and CONFIG_ARMV8_SEC_FIRMWARE_SUPPORT
v6: new patch
--- test/cmd/fdt.c | 8 ++++++++ 1 file changed, 8 insertions(+)
test/cmd/fdt.c +8 -0
@@ -1347,6 +1347,10 @@ static int fdt_test_chosen(struct unit_test_state *uts)ut_assert_nextlinen ("\tu-boot,version = " );/* Ignore the version string */ if (env_bootargs)ut_assert_nextline ("\tbootargs = \"%s\";" , env_bootargs); +if (IS_ENABLED (CONFIG_DM_RNG ) && + !IS_ENABLED (CONFIG_MEASURED_BOOT ) && + !IS_ENABLED (CONFIG_ARMV8_SEC_FIRMWARE_SUPPORT )) +ut_assert_nextlinen ("\tkaslr-seed = " );ut_assert_nextline ("};" );ut_assertok (ut_check_console_end (uts));
@@ -1363,6 +1367,10 @@ static int fdt_test_chosen(struct unit_test_state *uts)ut_assert_nextlinen ("\tu-boot,version = " );/* Ignore the version string */ if (env_bootargs)ut_assert_nextline ("\tbootargs = \"%s\";" , env_bootargs); +if (IS_ENABLED (CONFIG_DM_RNG ) && + !IS_ENABLED (CONFIG_MEASURED_BOOT ) && + !IS_ENABLED (CONFIG_ARMV8_SEC_FIRMWARE_SUPPORT )) +ut_assert_nextlinen ("\tkaslr-seed = " );ut_assert_nextline ("};" );ut_assertok (ut_check_console_end (uts));
Signature · 1 line
2.25.1
Quoted 10 lines · Tim Harvey
This series will automatically add /chosen/kaslr-seed to the dt if
DM_RNGis enabled
during the boot process.If
RANDOMIZE_BASEis enabled in the Linux kernel instructing it to randomize the virtual address at which the kernel image is loaded, it expects entropy to be provided by the bootloader by populating /chosen/kaslr-seed with a 64-bit value from source of entropy at boot.[...]
Applied to u-boot/next, thanks!
Signature · 1 line
Tom