diff --git a/1012-Clear-buffer-to-zero-for-screen-information.patch b/1012-Clear-buffer-to-zero-for-screen-information.patch new file mode 100644 index 0000000000000000000000000000000000000000..b2604e8be367fb437596fbd88018fca97495a56e --- /dev/null +++ b/1012-Clear-buffer-to-zero-for-screen-information.patch @@ -0,0 +1,40 @@ +From 50a6f8e80cec46932e53a73563d02e7739d69400 Mon Sep 17 00:00:00 2001 +From: Fedora Ninjas +Date: Wed, 23 Oct 2024 15:37:20 +0800 +Subject: [PATCH] Clear buffer to zero for screen information. Modify + introduced old code. + +--- + grub-core/kern/efi/mm.c | 2 +- + grub-core/loader/loongarch64/linux-elf.c | 2 ++ + 2 files changed, 3 insertions(+), 1 deletion(-) + +diff --git a/grub-core/kern/efi/mm.c b/grub-core/kern/efi/mm.c +index 6f8810e..4281feb 100644 +--- a/grub-core/kern/efi/mm.c ++++ b/grub-core/kern/efi/mm.c +@@ -469,7 +469,7 @@ filter_memory_map (grub_efi_memory_descriptor_t *memory_map, + #ifdef GRUB_CPU_LOONGARCH64 + && desc->physical_start <= grub_efi_max_usable_address() + #else +- && desc->physical_start <= GRUB_EFI_MAX_USABLE_ADDRESS ++ && desc->physical_start <= GRUB_EFI_MAX_ALLOCATION_ADDRESS + #endif + && desc->physical_start + PAGES_TO_BYTES (desc->num_pages) > 0x100000 + && desc->num_pages != 0) +diff --git a/grub-core/loader/loongarch64/linux-elf.c b/grub-core/loader/loongarch64/linux-elf.c +index bf3bfa4..34bfad7 100644 +--- a/grub-core/loader/loongarch64/linux-elf.c ++++ b/grub-core/loader/loongarch64/linux-elf.c +@@ -167,6 +167,8 @@ alloc_screen_info (void) + if (status != GRUB_EFI_SUCCESS) + return NULL; + ++ grub_memset((void *)si, 0, sizeof(struct screen_info)); ++ + status = b->install_configuration_table (&compat_screen_info_guid, si); + if (status != GRUB_EFI_SUCCESS) + goto free_mem; +-- +2.41.0 + diff --git a/grub.macros b/grub.macros index 40d7fd74923dbe7e5984be83f94b765fc1335b3a..5ef8230027381c50f08f6c71395bb368ddd11d63 100644 --- a/grub.macros +++ b/grub.macros @@ -342,7 +342,7 @@ git add . \ git commit -a -q -m "%{tarversion} baseline." \ git am --whitespace=nowarn %%{patches} - 2.12-11 +- Fix the introduced old code +- Clear buffer for screen information + * Thu Jan 02 2025 hanliyang - 2.12-10 - Support use confidential computing provisioned secrets for disk decryption