Re: [PATCH v2] fdt: automatically add /chosen/kaslr-seed if DM_RNG is enabled

[Marek Vasut]

On 5/15/24 10:50 PM, Tim Harvey wrote:

[...]

diff --git a/boot/fdt_support.c b/boot/fdt_support.c
index 874ca4d6f5af..3455d60d69dc 100644
--- a/boot/fdt_support.c
+++ b/boot/fdt_support.c
@@ -8,6 +8,7 @@

#include <abuf.h>

  #include <env.h>
+#include <kaslrseed.h>
  #include <log.h>
  #include <mapmem.h>
  #include <net.h>
@@ -300,6 +301,15 @@ int fdt_chosen(void *fdt)
        if (nodeoffset < 0)
                return nodeoffset;

+ if (IS_ENABLED(CONFIG_DM_RNG) && !IS_ENABLED(ARMV8_SEC_FIRMWARE_SUPPORT)) {

+               err = fdt_kaslrseed(fdt);
+               if (err) {
+                       printf("WARNING: could not set kaslr-seed %s.\n",
+                              fdt_strerror(err));
+                       return err;

Is this warning really a critical boot-breaking error ?

+               }
+       }
+
        if (IS_ENABLED(CONFIG_BOARD_RNG_SEED) && !board_rng_seed(&buf)) {
                err = fdt_setprop(fdt, nodeoffset, "rng-seed",
                                  abuf_data(&buf), abuf_size(&buf));

[...]

The rest looks good !