drop efi-libstub-use-efi_loader_code-region-when-moving-the-kernel-in-memory.patch

diff --git a/queue-5.15/efi-libstub-use-efi_loader_code-region-when-moving-the-kernel-in-memory.patch b/queue-5.15/efi-libstub-use-efi_loader_code-region-when-moving-the-kernel-in-memory.patch
deleted file mode 100644 (file)
index 6a4a2be..0000000
--- a/queue-5.15/efi-libstub-use-efi_loader_code-region-when-moving-the-kernel-in-memory.patch
+++ /dev/null
@@ -1,126 +0,0 @@
-From 9cf42bca30e98a1c6c9e8abf876940a551eaa3d1 Mon Sep 17 00:00:00 2001
-From: Ard Biesheuvel <ardb@kernel.org>
-Date: Tue, 2 Aug 2022 11:00:16 +0200
-Subject: efi: libstub: use EFI_LOADER_CODE region when moving the kernel in memory
-
-From: Ard Biesheuvel <ardb@kernel.org>
-
-commit 9cf42bca30e98a1c6c9e8abf876940a551eaa3d1 upstream.
-
-The EFI spec is not very clear about which permissions are being given
-when allocating pages of a certain type. However, it is quite obvious
-that EFI_LOADER_CODE is more likely to permit execution than
-EFI_LOADER_DATA, which becomes relevant once we permit booting the
-kernel proper with the firmware's 1:1 mapping still active.
-
-Ostensibly, recent systems such as the Surface Pro X grant executable
-permissions to EFI_LOADER_CODE regions but not EFI_LOADER_DATA regions.
-
-Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- drivers/firmware/efi/libstub/alignedmem.c  |    5 +++--
- drivers/firmware/efi/libstub/arm64-stub.c  |    6 ++++--
- drivers/firmware/efi/libstub/efistub.h     |    6 ++++--
- drivers/firmware/efi/libstub/mem.c         |    3 ++-
- drivers/firmware/efi/libstub/randomalloc.c |    5 +++--
- 5 files changed, 16 insertions(+), 9 deletions(-)
-
---- a/drivers/firmware/efi/libstub/alignedmem.c
-+++ b/drivers/firmware/efi/libstub/alignedmem.c
-@@ -22,7 +22,8 @@
-  * Return:    status code
-  */
- efi_status_t efi_allocate_pages_aligned(unsigned long size, unsigned long *addr,
--                                      unsigned long max, unsigned long align)
-+                                      unsigned long max, unsigned long align,
-+                                      int memory_type)
- {
-       efi_physical_addr_t alloc_addr;
-       efi_status_t status;
-@@ -36,7 +37,7 @@ efi_status_t efi_allocate_pages_aligned(
-       slack = align / EFI_PAGE_SIZE - 1;
- 
-       status = efi_bs_call(allocate_pages, EFI_ALLOCATE_MAX_ADDRESS,
--                           EFI_LOADER_DATA, size / EFI_PAGE_SIZE + slack,
-+                           memory_type, size / EFI_PAGE_SIZE + slack,
-                            &alloc_addr);
-       if (status != EFI_SUCCESS)
-               return status;
---- a/drivers/firmware/efi/libstub/arm64-stub.c
-+++ b/drivers/firmware/efi/libstub/arm64-stub.c
-@@ -133,7 +133,8 @@ efi_status_t handle_kernel_image(unsigne
-                * locate the kernel at a randomized offset in physical memory.
-                */
-               status = efi_random_alloc(*reserve_size, min_kimg_align,
--                                        reserve_addr, phys_seed);
-+                                        reserve_addr, phys_seed,
-+                                        EFI_LOADER_CODE);
-               if (status != EFI_SUCCESS)
-                       efi_warn("efi_random_alloc() failed: 0x%lx\n", status);
-       } else {
-@@ -154,7 +155,8 @@ efi_status_t handle_kernel_image(unsigne
-               }
- 
-               status = efi_allocate_pages_aligned(*reserve_size, reserve_addr,
--                                                  ULONG_MAX, min_kimg_align);
-+                                                  ULONG_MAX, min_kimg_align,
-+                                                  EFI_LOADER_CODE);
- 
-               if (status != EFI_SUCCESS) {
-                       efi_err("Failed to relocate kernel\n");
---- a/drivers/firmware/efi/libstub/efistub.h
-+++ b/drivers/firmware/efi/libstub/efistub.h
-@@ -764,7 +764,8 @@ void efi_get_virtmap(efi_memory_desc_t *
- efi_status_t efi_get_random_bytes(unsigned long size, u8 *out);
- 
- efi_status_t efi_random_alloc(unsigned long size, unsigned long align,
--                            unsigned long *addr, unsigned long random_seed);
-+                            unsigned long *addr, unsigned long random_seed,
-+                            int memory_type);
- 
- efi_status_t efi_random_get_seed(void);
- 
-@@ -790,7 +791,8 @@ efi_status_t efi_allocate_pages(unsigned
-                               unsigned long max);
- 
- efi_status_t efi_allocate_pages_aligned(unsigned long size, unsigned long *addr,
--                                      unsigned long max, unsigned long align);
-+                                      unsigned long max, unsigned long align,
-+                                      int memory_type);
- 
- efi_status_t efi_low_alloc_above(unsigned long size, unsigned long align,
-                                unsigned long *addr, unsigned long min);
---- a/drivers/firmware/efi/libstub/mem.c
-+++ b/drivers/firmware/efi/libstub/mem.c
-@@ -96,7 +96,8 @@ efi_status_t efi_allocate_pages(unsigned
- 
-       if (EFI_ALLOC_ALIGN > EFI_PAGE_SIZE)
-               return efi_allocate_pages_aligned(size, addr, max,
--                                                EFI_ALLOC_ALIGN);
-+                                                EFI_ALLOC_ALIGN,
-+                                                EFI_LOADER_DATA);
- 
-       alloc_addr = ALIGN_DOWN(max + 1, EFI_ALLOC_ALIGN) - 1;
-       status = efi_bs_call(allocate_pages, EFI_ALLOCATE_MAX_ADDRESS,
---- a/drivers/firmware/efi/libstub/randomalloc.c
-+++ b/drivers/firmware/efi/libstub/randomalloc.c
-@@ -53,7 +53,8 @@ static unsigned long get_entry_num_slots
- efi_status_t efi_random_alloc(unsigned long size,
-                             unsigned long align,
-                             unsigned long *addr,
--                            unsigned long random_seed)
-+                            unsigned long random_seed,
-+                            int memory_type)
- {
-       unsigned long map_size, desc_size, total_slots = 0, target_slot;
-       unsigned long buff_size;
-@@ -116,7 +117,7 @@ efi_status_t efi_random_alloc(unsigned l
-               pages = size / EFI_PAGE_SIZE;
- 
-               status = efi_bs_call(allocate_pages, EFI_ALLOCATE_ADDRESS,
--                                   EFI_LOADER_DATA, pages, &target);
-+                                   memory_type, pages, &target);
-               if (status == EFI_SUCCESS)
-                       *addr = target;
-               break;

diff --git a/queue-5.15/series b/queue-5.15/series
index 590c2e71bbddc789acbed1050dc6d8a1214186d8..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 (file)
--- a/queue-5.15/series
+++ b/queue-5.15/series
@@ -1 +0,0 @@
-efi-libstub-use-efi_loader_code-region-when-moving-the-kernel-in-memory.patch

diff --git a/queue-6.1/efi-libstub-use-efi_loader_code-region-when-moving-the-kernel-in-memory.patch b/queue-6.1/efi-libstub-use-efi_loader_code-region-when-moving-the-kernel-in-memory.patch
deleted file mode 100644 (file)
index 2000334..0000000
--- a/queue-6.1/efi-libstub-use-efi_loader_code-region-when-moving-the-kernel-in-memory.patch
+++ /dev/null
@@ -1,126 +0,0 @@
-From 9cf42bca30e98a1c6c9e8abf876940a551eaa3d1 Mon Sep 17 00:00:00 2001
-From: Ard Biesheuvel <ardb@kernel.org>
-Date: Tue, 2 Aug 2022 11:00:16 +0200
-Subject: efi: libstub: use EFI_LOADER_CODE region when moving the kernel in memory
-
-From: Ard Biesheuvel <ardb@kernel.org>
-
-commit 9cf42bca30e98a1c6c9e8abf876940a551eaa3d1 upstream.
-
-The EFI spec is not very clear about which permissions are being given
-when allocating pages of a certain type. However, it is quite obvious
-that EFI_LOADER_CODE is more likely to permit execution than
-EFI_LOADER_DATA, which becomes relevant once we permit booting the
-kernel proper with the firmware's 1:1 mapping still active.
-
-Ostensibly, recent systems such as the Surface Pro X grant executable
-permissions to EFI_LOADER_CODE regions but not EFI_LOADER_DATA regions.
-
-Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- drivers/firmware/efi/libstub/alignedmem.c  |    5 +++--
- drivers/firmware/efi/libstub/arm64-stub.c  |    6 ++++--
- drivers/firmware/efi/libstub/efistub.h     |    6 ++++--
- drivers/firmware/efi/libstub/mem.c         |    3 ++-
- drivers/firmware/efi/libstub/randomalloc.c |    5 +++--
- 5 files changed, 16 insertions(+), 9 deletions(-)
-
---- a/drivers/firmware/efi/libstub/alignedmem.c
-+++ b/drivers/firmware/efi/libstub/alignedmem.c
-@@ -22,7 +22,8 @@
-  * Return:    status code
-  */
- efi_status_t efi_allocate_pages_aligned(unsigned long size, unsigned long *addr,
--                                      unsigned long max, unsigned long align)
-+                                      unsigned long max, unsigned long align,
-+                                      int memory_type)
- {
-       efi_physical_addr_t alloc_addr;
-       efi_status_t status;
-@@ -36,7 +37,7 @@ efi_status_t efi_allocate_pages_aligned(
-       slack = align / EFI_PAGE_SIZE - 1;
- 
-       status = efi_bs_call(allocate_pages, EFI_ALLOCATE_MAX_ADDRESS,
--                           EFI_LOADER_DATA, size / EFI_PAGE_SIZE + slack,
-+                           memory_type, size / EFI_PAGE_SIZE + slack,
-                            &alloc_addr);
-       if (status != EFI_SUCCESS)
-               return status;
---- a/drivers/firmware/efi/libstub/arm64-stub.c
-+++ b/drivers/firmware/efi/libstub/arm64-stub.c
-@@ -180,7 +180,8 @@ efi_status_t handle_kernel_image(unsigne
-                * locate the kernel at a randomized offset in physical memory.
-                */
-               status = efi_random_alloc(*reserve_size, min_kimg_align,
--                                        reserve_addr, phys_seed);
-+                                        reserve_addr, phys_seed,
-+                                        EFI_LOADER_CODE);
-               if (status != EFI_SUCCESS)
-                       efi_warn("efi_random_alloc() failed: 0x%lx\n", status);
-       } else {
-@@ -201,7 +202,8 @@ efi_status_t handle_kernel_image(unsigne
-               }
- 
-               status = efi_allocate_pages_aligned(*reserve_size, reserve_addr,
--                                                  ULONG_MAX, min_kimg_align);
-+                                                  ULONG_MAX, min_kimg_align,
-+                                                  EFI_LOADER_CODE);
- 
-               if (status != EFI_SUCCESS) {
-                       efi_err("Failed to relocate kernel\n");
---- a/drivers/firmware/efi/libstub/efistub.h
-+++ b/drivers/firmware/efi/libstub/efistub.h
-@@ -880,7 +880,8 @@ void efi_get_virtmap(efi_memory_desc_t *
- efi_status_t efi_get_random_bytes(unsigned long size, u8 *out);
- 
- efi_status_t efi_random_alloc(unsigned long size, unsigned long align,
--                            unsigned long *addr, unsigned long random_seed);
-+                            unsigned long *addr, unsigned long random_seed,
-+                            int memory_type);
- 
- efi_status_t efi_random_get_seed(void);
- 
-@@ -907,7 +908,8 @@ efi_status_t efi_allocate_pages(unsigned
-                               unsigned long max);
- 
- efi_status_t efi_allocate_pages_aligned(unsigned long size, unsigned long *addr,
--                                      unsigned long max, unsigned long align);
-+                                      unsigned long max, unsigned long align,
-+                                      int memory_type);
- 
- efi_status_t efi_low_alloc_above(unsigned long size, unsigned long align,
-                                unsigned long *addr, unsigned long min);
---- a/drivers/firmware/efi/libstub/mem.c
-+++ b/drivers/firmware/efi/libstub/mem.c
-@@ -91,7 +91,8 @@ efi_status_t efi_allocate_pages(unsigned
- 
-       if (EFI_ALLOC_ALIGN > EFI_PAGE_SIZE)
-               return efi_allocate_pages_aligned(size, addr, max,
--                                                EFI_ALLOC_ALIGN);
-+                                                EFI_ALLOC_ALIGN,
-+                                                EFI_LOADER_DATA);
- 
-       alloc_addr = ALIGN_DOWN(max + 1, EFI_ALLOC_ALIGN) - 1;
-       status = efi_bs_call(allocate_pages, EFI_ALLOCATE_MAX_ADDRESS,
---- a/drivers/firmware/efi/libstub/randomalloc.c
-+++ b/drivers/firmware/efi/libstub/randomalloc.c
-@@ -53,7 +53,8 @@ static unsigned long get_entry_num_slots
- efi_status_t efi_random_alloc(unsigned long size,
-                             unsigned long align,
-                             unsigned long *addr,
--                            unsigned long random_seed)
-+                            unsigned long random_seed,
-+                            int memory_type)
- {
-       unsigned long total_slots = 0, target_slot;
-       unsigned long total_mirrored_slots = 0;
-@@ -118,7 +119,7 @@ efi_status_t efi_random_alloc(unsigned l
-               pages = size / EFI_PAGE_SIZE;
- 
-               status = efi_bs_call(allocate_pages, EFI_ALLOCATE_ADDRESS,
--                                   EFI_LOADER_DATA, pages, &target);
-+                                   memory_type, pages, &target);
-               if (status == EFI_SUCCESS)
-                       *addr = target;
-               break;

diff --git a/queue-6.1/series b/queue-6.1/series
index b91c0ac372b88f32948c732f18f55d79e05b6916..5ca43b3a80d75c483c504f4bf184b90c3478d13a 100644 (file)
--- a/queue-6.1/series
+++ b/queue-6.1/series
@@ -6,4 +6,3 @@ drm-amd-display-keep-phy-active-for-dp-config.patch
 ovl-fix-null-pointer-dereference-in-ovl_permission.patch
 drm-amd-move-helper-for-dynamic-speed-switch-check-out-of-smu13.patch
 drm-amd-align-smu11-smu_msg_overridepcieparameters-implementation-with-smu13.patch
-efi-libstub-use-efi_loader_code-region-when-moving-the-kernel-in-memory.patch