diff --git a/fix-compressed-kernel-verification-failed.patch b/fix-compressed-kernel-verification-failed.patch new file mode 100644 index 0000000..e02cf09 --- /dev/null +++ b/fix-compressed-kernel-verification-failed.patch @@ -0,0 +1,29 @@ +From 0a73812b9ba12f8af4909b952751d6d5f4fd2dd2 Mon Sep 17 00:00:00 2001 +From: Qiumiao Zhang +Date: Sat, 23 Jul 2022 19:54:34 +0800 +Subject: [PATCH] fix compressed kernel verification failed + +Signed-off-by: Yusong Gao +--- + include/grub/file.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/include/grub/file.h b/include/grub/file.h +index 96827a4..b956dbb 100644 +--- a/include/grub/file.h ++++ b/include/grub/file.h +@@ -180,10 +180,10 @@ extern grub_disk_read_hook_t EXPORT_VAR(grub_file_progress_hook); + /* Filters with lower ID are executed first. */ + typedef enum grub_file_filter_id + { +- GRUB_FILE_FILTER_VERIFY, + GRUB_FILE_FILTER_GZIO, + GRUB_FILE_FILTER_XZIO, + GRUB_FILE_FILTER_LZOPIO, ++ GRUB_FILE_FILTER_VERIFY, + GRUB_FILE_FILTER_MAX, + GRUB_FILE_FILTER_COMPRESSION_FIRST = GRUB_FILE_FILTER_GZIO, + GRUB_FILE_FILTER_COMPRESSION_LAST = GRUB_FILE_FILTER_LZOPIO, +-- +2.27.0 + diff --git a/grub.patches b/grub.patches index 63ec1fb..73733f9 100644 --- a/grub.patches +++ b/grub.patches @@ -262,3 +262,4 @@ Patch0262: backport-net-http-Fix-OOB-write-for-split-http-headers.patch Patch0263: backport-net-http-Error-out-on-headers-with-LF-without-CR.patch Patch0264: backport-misc-Make-grub_min-and-grub_max-more-resilient.patch Patch0265: backport-EFI-allocate-kernel-in-EFI_RUNTIME_SERVICES_CODE-ins.patch +Patch0266: fix-compressed-kernel-verification-failed.patch diff --git a/grub2.spec b/grub2.spec index db22e07..4ca2eb4 100644 --- a/grub2.spec +++ b/grub2.spec @@ -14,7 +14,7 @@ Name: grub2 Epoch: 1 Version: 2.06 -Release: 10 +Release: 11 Summary: Bootloader with support for Linux, Multiboot and more License: GPLv3+ URL: http://www.gnu.org/software/grub/ @@ -436,6 +436,12 @@ fi %{_datadir}/man/man* %changelog +* Sat Jul 23 2022 zhangqiumiao - 1:2.06-11 +- Type:bugfix +- CVE:NA +- SUG:NA +- DESC:fix compressed kernel verification failed + * Wed Jun 29 2022 zhangqiumiao - 1:2.06-10 - Type:requirement - CVE:NA