Hi Andrew,
Based on Dave's feedback above, could you please take the following
fix and squash it with "x86/boot: make sure KASLR does not step over
KHO preserved memory" with the updated commit message in mm-unstable?
Thank you very much!
Best,
Changyuan
---- 8< ----
>From 464b5750c55f978b47da242f50ec7dbcbac1948c Mon Sep 17 00:00:00 2001
From: "Mike Rapoport (Microsoft)" <r...@kernel.org>
Date: Mon, 5 May 2025 11:29:23 -0700
Subject: [PATCH] fixup! x86/boot: make sure KASLR does not step over KHO
preserved memory
During kexec handover (KHO) memory contains data that should be
preserved and this data would be consumed by kexec'ed kernel.
To make sure that the preserved memory is not overwritten, KHO uses
"scratch regions" to bootstrap kexec'ed kernel. These regions are
guaranteed to not have any memory that KHO would preserve and are used as
the only memory the kernel sees during the early boot.
The scratch regions are passed in the setup_data by the first kernel with
other KHO parameters. If the setup_data contains the KHO parameters, limit
randomization to scratch areas only to make sure preserved memory won't get
overwritten.
Since all the pointers in setup_data are represented by u64, they require
double casting (first to unsigned long and then to the actual pointer type)
to compile on 32-bits. This looks goofy out of context, but it is
unfortunately the way that this is handled across the tree. There are at
least a dozen instances of casting like this.
Signed-off-by: Alexander Graf <g...@amazon.com>
Co-developed-by: Mike Rapoport (Microsoft) <r...@kernel.org>
Signed-off-by: Mike Rapoport (Microsoft) <r...@kernel.org>
Co-developed-by: Changyuan Lyu <changyu...@google.com>
Signed-off-by: Changyuan Lyu <changyu...@google.com>
---
arch/x86/boot/compressed/kaslr.c | 26 ++++++++++++--------------
1 file changed, 12 insertions(+), 14 deletions(-)
diff --git a/arch/x86/boot/compressed/kaslr.c b/arch/x86/boot/compressed/kaslr.c
index 25de8c3e17cdb..3b0948ad449f9 100644
--- a/arch/x86/boot/compressed/kaslr.c
+++ b/arch/x86/boot/compressed/kaslr.c
@@ -764,25 +764,26 @@ static void process_e820_entries(unsigned long minimum,
* If KHO is active, only process its scratch areas to ensure we are not
* stepping onto preserved memory.
*/
-#ifdef CONFIG_KEXEC_HANDOVER
static bool process_kho_entries(unsigned long minimum, unsigned long
image_size)
{
struct kho_scratch *kho_scratch;
struct setup_data *ptr;
+ struct kho_data *kho;
int i, nr_areas = 0;
- ptr = (struct setup_data *)boot_params_ptr->hdr.setup_data;
+ if (!IS_ENABLED(CONFIG_KEXEC_HANDOVER))
+ return false;
+
+ ptr = (struct setup_data *)(unsigned
long)boot_params_ptr->hdr.setup_data;
while (ptr) {
if (ptr->type == SETUP_KEXEC_KHO) {
- struct kho_data *kho = (struct kho_data *)ptr->data;
-
- kho_scratch = (void *)kho->scratch_addr;
+ kho = (struct kho_data *)(unsigned long)ptr->data;
+ kho_scratch = (void *)(unsigned long)kho->scratch_addr;
nr_areas = kho->scratch_size / sizeof(*kho_scratch);
-
break;
}
- ptr = (struct setup_data *)ptr->next;
+ ptr = (struct setup_data *)(unsigned long)ptr->next;
}
if (!nr_areas)
@@ -801,13 +802,6 @@ static bool process_kho_entries(unsigned long minimum,
unsigned long image_size)
return true;
}
-#else
-static inline bool process_kho_entries(unsigned long minimum,
- unsigned long image_size)
-{
- return false;
-}
-#endif
static unsigned long find_random_phys_addr(unsigned long minimum,
unsigned long image_size)
@@ -824,6 +818,10 @@ static unsigned long find_random_phys_addr(unsigned long
minimum,
return 0;
}
+ /*
+ * During kexec handover only process KHO scratch areas that are known
+ * not to contain any data that must be preserved.
+ */
if (!process_kho_entries(minimum, image_size) &&
!process_efi_entries(minimum, image_size))
process_e820_entries(minimum, image_size);
--
2.49.0.967.g6a0df3ecc3-goog
