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

!383 [sync] PR-380: fix compressed kernel verification failed

Browse Source 
From: @openeuler-sync-bot 
Reviewed-by: @zhangqiumiao 
Signed-off-by: @zhangqiumiao
This commit is contained in:
openeuler-ci-bot 2024-04-08 11:57:05 +00:00 committed by Gitee
commit 7caad006fb
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
4 changed files with 86 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
fix-compressed-kernel-verification-failed.patch Normal file
View File

@ -0,0 +1,29 @@
From 0a73812b9ba12f8af4909b952751d6d5f4fd2dd2 Mon Sep 17 00:00:00 2001
From: Qiumiao Zhang <zhangqiumiao1@huawei.com>
Date: Sat, 23 Jul 2022 19:54:34 +0800
Subject: [PATCH] fix compressed kernel verification failed
Signed-off-by: Yusong Gao <gaoyusong2@huawei.com>
---
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 daf23a9..5279e7d 100644
--- a/include/grub/file.h
+++ b/include/grub/file.h
@@ -187,10 +187,10 @@ typedef enum grub_file_filter_id
{
GRUB_FILE_FILTER_DISTRUST,
GRUB_FILE_FILTER_NOCAT,
- 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.33.0

48
fix-setupmode-not-available-in-some-machine.patch Normal file
View File

@ -0,0 +1,48 @@
From 4fc72f509627da808b452eb1186282237c449b65 Mon Sep 17 00:00:00 2001
From: fengtao <fengtao40@huawei.com>
Date: Tue, 22 Mar 2022 22:22:22 +0800
Subject: [PATCH] fix setupmode not available in some machine
In some machine, there is no setupmode variable, so we should
give setupmode a default vaule: setup_mode = 0
if we cannot get setupmode variable, we use setup_mode instead.
---
grub-core/kern/efi/sb.c | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/grub-core/kern/efi/sb.c b/grub-core/kern/efi/sb.c
index c52ec62..f58fb13 100644
--- a/grub-core/kern/efi/sb.c
+++ b/grub-core/kern/efi/sb.c
@@ -50,6 +50,7 @@ grub_efi_get_secureboot (void)
grub_uint8_t *moksbstate = NULL;
grub_uint8_t secureboot = GRUB_EFI_SECUREBOOT_MODE_UNKNOWN;
const char *secureboot_str = "UNKNOWN";
+ grub_uint8_t setup_mode = 0;
status = grub_efi_get_variable ("SecureBoot", &efi_variable_guid,
&size, (void **) &secboot);
@@ -67,9 +68,16 @@ grub_efi_get_secureboot (void)
&size, (void **) &setupmode);
if (status != GRUB_EFI_SUCCESS)
- goto out;
+ {
+ grub_dprintf ("efi", "No SetupMode variable\n");
+ }
+ else
+ {
+ grub_dprintf ("efi", "SetupMode: %d\n", *setupmode);
+ setup_mode = *setupmode;
+ }
- if ((*secboot == 0) || (*setupmode == 1))
+ if ((*secboot == 0) || (setup_mode == 1))
{
secureboot = GRUB_EFI_SECUREBOOT_MODE_DISABLED;
goto out;
--
2.23.0

2
grub.patches
View File

@ -218,3 +218,5 @@ Patch217: 0035-Add-friendly-grub2-password-config-tool-985962.patch
Patch218: grub2-set-password-prompts-to-enter-the-current-pass.patch
Patch219: add-TPCM-support-with-ipmi-channel.patch
Patch220: skip-verification-when-not-loading-grub.cfg.patch
Patch221: fix-setupmode-not-available-in-some-machine.patch
Patch222: fix-compressed-kernel-verification-failed.patch

8
grub2.spec
View File

@ -14,7 +14,7 @@
Name: grub2
Epoch: 1
Version: 2.12
Release: 6
Release: 7
Summary: Bootloader with support for Linux, Multiboot and more
License: GPLv3+
URL: http://www.gnu.org/software/grub/
@ -447,6 +447,12 @@ fi
%{_datadir}/man/man*
%changelog
* Mon Apr 8 2024 zhangqiumiao <zhangqiumiao1@huawei.com> - 1:2.12-7
- Type:bugfix
- CVE:NA
- SUG:NA
- DESC:fix compressed kernel verification failed
* Fri Mar 22 2024 jinlun <jinlun@huawei.com> - 1:2.12-6
- Type:requirement
- CVE:NA