packages/grub2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

skip verification when just opening the grub.cfg without loading it

Browse Source 
Signed-off-by: Qiumiao Zhang <zhangqiumiao1@huawei.com>
This commit is contained in:
Qiumiao Zhang 2023-05-31 15:23:38 +08:00
parent 51878472cd
commit 2b708750bd
3 changed files with 38 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
grub.patches
View File

@ -446,4 +446,5 @@ Patch0445: backport-fs-iso9660-Prevent-skipping-CE-or-ST-at-start-of-continuatio
Patch0446: backport-fs-iso9660-Incorrect-check-for-entry-boundary.patch
Patch0447: backport-fs-iso9660-Avoid-reading-past-the-entry-boundary.patch
Patch0448: backport-net-bootp-Fix-unchecked-return-value.patch
Patch0449: backport-osdep-linux-hostdisk-Modify-sector-by-sysfs-as-disk-sector.patch
Patch0449: backport-osdep-linux-hostdisk-Modify-sector-by-sysfs-as-disk-sector.patch
Patch0450: skip-verification-when-not-loading-grub.cfg.patch

8
grub2.spec
View File

@ -8,7 +8,7 @@
Name: grub2
Epoch: 1
Version: 2.04
Release: 32
Release: 33
Summary: Bootloader with support for Linux, Multiboot and more
License: GPLv3+
URL: http://www.gnu.org/software/grub/
@ -442,6 +442,12 @@ rm -r /boot/grub2.tmp/ || :
%{_datadir}/man/man*
%changelog
* Wed May 31 2023 zhangqiumiao <zhangqiumiao1@huawei.com> - 1:2.04-33
- Type:bugfix
- CVE:NA
- SUG:NA
- DESC:skip verification when not loading grub.cfg
* Sun Apr 16 2023 zhangqiumiao <zhangqiumiao1@huawei.com> - 1:2.04-32
- Type:bugfix
- CVE:NA

29
skip-verification-when-not-loading-grub.cfg.patch Normal file
View File

@ -0,0 +1,29 @@
From c8b6446348a445a51024d04b2e8e5b417c3a1f73 Mon Sep 17 00:00:00 2001
From: Qiumiao Zhang <zhangqiumiao1@huawei.com>
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 <zhangqiumiao1@huawei.com>
---
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 f7ee912..7a2dd3b 100644
--- a/grub-core/normal/main.c
+++ b/grub-core/normal/main.c
@@ -368,7 +368,7 @@ grub_try_normal (const char *variable)
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