[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <20230908104458.775740-1-songshuaishuai@tinylab.org>
Date: Fri, 8 Sep 2023 18:44:58 +0800
From: Song Shuai <songshuaishuai@...ylab.org>
To: robh+dt@...nel.org, frowand.list@...il.com
Cc: devicetree@...r.kernel.org, linux-kernel@...r.kernel.org,
Song Shuai <songshuaishuai@...ylab.org>
Subject: [PATCH] of/kexec: Omit kaslr-seed when kexecing with nokaslr
The chosen node always adds the kaslr-seed property which is needless
for the kernels kexeced with the cmdline contained "nokaslr".
So omit the kaslr-seed when kexecing with nokaslr.
Signed-off-by: Song Shuai <songshuaishuai@...ylab.org>
---
drivers/of/kexec.c | 15 ++++++++++++---
1 file changed, 12 insertions(+), 3 deletions(-)
diff --git a/drivers/of/kexec.c b/drivers/of/kexec.c
index f26d2ba8a371..c0d53b10cb70 100644
--- a/drivers/of/kexec.c
+++ b/drivers/of/kexec.c
@@ -19,6 +19,7 @@
#include <linux/random.h>
#include <linux/slab.h>
#include <linux/types.h>
+#include <linux/string.h>
#define RNG_SEED_SIZE 128
@@ -263,6 +264,14 @@ static inline int setup_ima_buffer(const struct kimage *image, void *fdt,
}
#endif /* CONFIG_IMA_KEXEC */
+static bool is_nokaslr_cmdline(const char *cmdline)
+{
+ char *str;
+
+ str = strstr(cmdline, "nokaslr");
+ return str == cmdline || (str > cmdline && *(str - 1) == ' ');
+}
+
/*
* of_kexec_alloc_and_setup_fdt - Alloc and setup a new Flattened Device Tree
*
@@ -429,15 +438,15 @@ void *of_kexec_alloc_and_setup_fdt(const struct kimage *image,
else if (ret)
goto out;
- if (rng_is_initialized()) {
+ if (!is_nokaslr_cmdline(cmdline) && rng_is_initialized()) {
u64 seed = get_random_u64();
ret = fdt_setprop_u64(fdt, chosen_node, "kaslr-seed", seed);
if (ret)
goto out;
} else {
- pr_notice("RNG is not initialised: omitting \"%s\" property\n",
- "kaslr-seed");
+ pr_notice("RNG is not initialised or Kexec with nokaslr:"
+ " omitting \"%s\" property\n", "kaslr-seed");
}
/* add rng-seed */
--
2.20.1
Powered by blists - more mailing lists