| |
@@ -0,0 +1,47 @@
|
| |
+ From 71402fac6df4af0c06fea69aec6cf4907a1234e0 Mon Sep 17 00:00:00 2001
|
| |
+ From: Maximilian Luz <luzmaximilian@gmail.com>
|
| |
+ Date: Tue, 28 Jun 2022 23:06:46 +0200
|
| |
+ Subject: [PATCH] arm64: Use proper memory type for kernel allocation
|
| |
+
|
| |
+ Currently, the kernel pages are allocated with type EFI_LOADER_DATA.
|
| |
+ While the vast majority of systems will happily execute code from those
|
| |
+ pages (i.e. don't care about memory protection), the Microsoft Surface
|
| |
+ Pro X stalls, as this memory is not designated as "executable".
|
| |
+
|
| |
+ Therefore, allocate the kernel pages as EFI_LOADER_CODE to request
|
| |
+ memory that is actually executable.
|
| |
+
|
| |
+ Signed-off-by: Maximilian Luz <luzmaximilian@gmail.com>
|
| |
+ ---
|
| |
+ grub-core/loader/arm64/linux.c | 7 ++++++-
|
| |
+ 1 file changed, 6 insertions(+), 1 deletion(-)
|
| |
+
|
| |
+ diff --git a/grub-core/loader/arm64/linux.c b/grub-core/loader/arm64/linux.c
|
| |
+ index 419f2201d..a3a193c25 100644
|
| |
+ --- a/grub-core/loader/arm64/linux.c
|
| |
+ +++ b/grub-core/loader/arm64/linux.c
|
| |
+ @@ -26,7 +26,9 @@
|
| |
+ #include <grub/mm.h>
|
| |
+ #include <grub/types.h>
|
| |
+ #include <grub/cpu/linux.h>
|
| |
+ +#include <grub/efi/api.h>
|
| |
+ #include <grub/efi/efi.h>
|
| |
+ +#include <grub/cpu/efi/memory.h>
|
| |
+ #include <grub/efi/fdtload.h>
|
| |
+ #include <grub/efi/memory.h>
|
| |
+ #include <grub/efi/linux.h>
|
| |
+ @@ -403,7 +405,10 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
|
| |
+ grub_loader_unset();
|
| |
+
|
| |
+ kernel_alloc_pages = GRUB_EFI_BYTES_TO_PAGES (kernel_size + align - 1);
|
| |
+ - kernel_alloc_addr = grub_efi_allocate_any_pages (kernel_alloc_pages);
|
| |
+ + kernel_alloc_addr = grub_efi_allocate_pages_real (GRUB_EFI_MAX_USABLE_ADDRESS,
|
| |
+ + kernel_alloc_pages,
|
| |
+ + GRUB_EFI_ALLOCATE_MAX_ADDRESS,
|
| |
+ + GRUB_EFI_LOADER_CODE);
|
| |
+ grub_dprintf ("linux", "kernel numpages: %d\n", kernel_alloc_pages);
|
| |
+ if (!kernel_alloc_addr)
|
| |
+ {
|
| |
+ --
|
| |
+ 2.41.0
|
| |
+
|
| |
jlinton
commented 10 months ago
Various arm devices (x13s, ms surface, etc) no longer are
setting the execute bit on pages allocated as data, nor do they
have the protocol to update page permissions. This results
in boot failures on these machines when grub jumps to the
kernel and the page isn't marked as executable.
Resolves: #2149020
Signed-off-by: Jeremy Linton jeremy.linton@arm.com