From 1a70c89178317faf0fe5fe4a7402ce5c1f301084 Mon Sep 17 00:00:00 2001 From: Qiumiao Zhang Date: Wed, 20 Dec 2023 15:08:39 +0800 Subject: [PATCH] skip verification when not loading grub.cfg Signed-off-by: Qiumiao Zhang --- grub.patches | 1 + grub2.spec | 8 ++++- ...rification-when-not-loading-grub.cfg.patch | 29 +++++++++++++++++++ 3 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 skip-verification-when-not-loading-grub.cfg.patch diff --git a/grub.patches b/grub.patches index 36a8699..87bc09d 100644 --- a/grub.patches +++ b/grub.patches @@ -351,3 +351,4 @@ Patch0341: backport-fs-ntfs-Fix-an-OOB-read-when-parsing-bitmaps-for-ind.patch Patch0342: backport-fs-ntfs-Fix-an-OOB-read-when-parsing-a-volume-label.patch Patch0343: backport-fs-ntfs-Make-code-more-readable.patch Patch0344: add-TPCM-support-with-ipmi-channel.patch +Patch0345: skip-verification-when-not-loading-grub.cfg.patch diff --git a/grub2.spec b/grub2.spec index 23ec1cb..b816a8f 100644 --- a/grub2.spec +++ b/grub2.spec @@ -14,7 +14,7 @@ Name: grub2 Epoch: 1 Version: 2.06 -Release: 41 +Release: 42 Summary: Bootloader with support for Linux, Multiboot and more License: GPLv3+ URL: http://www.gnu.org/software/grub/ @@ -448,6 +448,12 @@ fi %{_datadir}/man/man* %changelog +* Wed Dec 20 2023 zhangqiumiao - 1:2.06-42 +- Type:requirement +- CVE:NA +- SUG:NA +- DESC:skip verification when not loading grub.cfg + * Tue Nov 28 2023 zhangqiumiao - 1:2.06-41 - Type:requirement - CVE:NA diff --git a/skip-verification-when-not-loading-grub.cfg.patch b/skip-verification-when-not-loading-grub.cfg.patch new file mode 100644 index 0000000..6928000 --- /dev/null +++ b/skip-verification-when-not-loading-grub.cfg.patch @@ -0,0 +1,29 @@ +From c8b6446348a445a51024d04b2e8e5b417c3a1f73 Mon Sep 17 00:00:00 2001 +From: Qiumiao Zhang +Date: Wed, 31 May 2023 15:13:07 +0800 +Subject: [PATCH] skip verification when not loading grub.cfg + +Skip verification when just opening the grub.cfg without loading it. +There is no need to verify grub.cfg twice when tpcm is enabled. + +Signed-off-by: Qiumiao Zhang +--- + grub-core/normal/main.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/grub-core/normal/main.c b/grub-core/normal/main.c +index b72fe3d..8ce5a60 100644 +--- a/grub-core/normal/main.c ++++ b/grub-core/normal/main.c +@@ -369,7 +369,7 @@ grub_try_normal_prefix (const char *prefix) + if (config) + { + grub_file_t file; +- file = grub_file_open (config, GRUB_FILE_TYPE_CONFIG); ++ file = grub_file_open (config, GRUB_FILE_TYPE_SKIP_SIGNATURE); + if (file) + { + grub_file_close (file); +-- +2.27.0 + -- Gitee