diff --git a/Fix-that-patch-28dcf48482-introduced-old-code.patch b/Fix-that-patch-28dcf48482-introduced-old-code.patch new file mode 100644 index 0000000000000000000000000000000000000000..2371388c6110c1bf4ead06e619a3b54c4a155311 --- /dev/null +++ b/Fix-that-patch-28dcf48482-introduced-old-code.patch @@ -0,0 +1,25 @@ +From 0bc8d39e5c12e8fefa43962d8a741061cd78c649 Mon Sep 17 00:00:00 2001 +From: Xue Liu +Date: Tue, 28 May 2024 16:49:06 +0800 +Subject: [PATCH] Fix that patch 28dcf48482 introduced old code + +--- + grub-core/kern/efi/mm.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/grub-core/kern/efi/mm.c b/grub-core/kern/efi/mm.c +index 31bffb534414..afad55e98880 100644 +--- a/grub-core/kern/efi/mm.c ++++ b/grub-core/kern/efi/mm.c +@@ -501,7 +501,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) +-- +2.43.0 + diff --git a/grub.patches b/grub.patches index 245b57d2a3cdb9c5db55845ce8fdd8af59811bf4..6e08bf224eebb95f17c6585ad37c95f4596ec09e 100644 --- a/grub.patches +++ b/grub.patches @@ -229,5 +229,6 @@ Patch228: 0002-Revert-templates-Properly-disable-the-os-prober-by-d.patch Patch229: 0003-Revert-templates-Disable-the-os-prober-by-default.patch Patch230: Handle-non-continuous-data-blocks-in-directory-exten.patch Patch231: loongarch64-fix-GRUB_EFI_MAX_ALLOCATION_ADDRESS-unde.patch -Patch232: modify-efi_max_usable-addr.patch -Patch233: LoongArch-Add-back-compatibility-for-linux-kernel.patch +Patch232: modify-efi_max_usable-addr.patch +Patch233: LoongArch-Add-back-compatibility-for-linux-kernel.patch +Patch234: Fix-that-patch-28dcf48482-introduced-old-code.patch diff --git a/grub2.spec b/grub2.spec index 888d5429394fcebbe7af6f2dc24d162f79652b32..70a6c06ccf0f337720dd0c5ada0c5b343274e9ec 100644 --- a/grub2.spec +++ b/grub2.spec @@ -14,7 +14,7 @@ Name: grub2 Epoch: 1 Version: 2.12 -Release: 13 +Release: 14 Summary: Bootloader with support for Linux, Multiboot and more License: GPLv3+ URL: http://www.gnu.org/software/grub/ @@ -447,6 +447,11 @@ fi %{_datadir}/man/man* %changelog +* Tue May 28 2024 liuxue - 1:2.12-14 +- Type:bugfix +- CVE:NA +- SUG:NA +- DESC:Fix that patch233 introduced old code * Sat May 25 2024 liuxue - 1:2.12-13 - Type:requirement