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

!349 [sync] PR-348: skip verification when just opening the grub.cfg without loading it

Browse Source 
From: @openeuler-sync-bot 
Reviewed-by: @t_feng 
Signed-off-by: @t_feng
This commit is contained in:
openeuler-ci-bot 2023-12-23 07:18:09 +00:00 committed by Gitee
commit c2dd5e0bce
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
3 changed files with 37 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
grub.patches
View File

@ -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 Patch0342: backport-fs-ntfs-Fix-an-OOB-read-when-parsing-a-volume-label.patch
Patch0343: backport-fs-ntfs-Make-code-more-readable.patch Patch0343: backport-fs-ntfs-Make-code-more-readable.patch
Patch0344: add-TPCM-support-with-ipmi-channel.patch Patch0344: add-TPCM-support-with-ipmi-channel.patch
Patch0345: skip-verification-when-not-loading-grub.cfg.patch

8
grub2.spec
View File

@ -14,7 +14,7 @@
Name: grub2 Name: grub2
Epoch: 1 Epoch: 1
Version: 2.06 Version: 2.06
Release: 41 Release: 42
Summary: Bootloader with support for Linux, Multiboot and more Summary: Bootloader with support for Linux, Multiboot and more
License: GPLv3+ License: GPLv3+
URL: http://www.gnu.org/software/grub/ URL: http://www.gnu.org/software/grub/
@ -448,6 +448,12 @@ fi
%{_datadir}/man/man* %{_datadir}/man/man*
%changelog %changelog
* Wed Dec 20 2023 zhangqiumiao <zhangqiumiao1@huawei.com> - 1:2.06-42
- Type:requirement
- CVE:NA
- SUG:NA
- DESC:skip verification when not loading grub.cfg
* Tue Nov 28 2023 zhangqiumiao <zhangqiumiao1@huawei.com> - 1:2.06-41 * Tue Nov 28 2023 zhangqiumiao <zhangqiumiao1@huawei.com> - 1:2.06-41
- Type:requirement - Type:requirement
- CVE:NA - 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 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