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

!210 [sync] PR-208: Fix the issue that the gBS->LoadImage pointer was empty.

Browse Source 
From: @openeuler-sync-bot 
Reviewed-by: @HuaxinLuGitee 
Signed-off-by: @HuaxinLuGitee
This commit is contained in:
openeuler-ci-bot 2025-02-11 08:43:37 +00:00 committed by Gitee
commit 7c82811384
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 44 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
backport-Fix-the-issue-that-the-gBS-LoadImage-pointer-was-emp.patch Normal file
View File

@ -0,0 +1,39 @@
From 712097206702f26e96be3f7ba79eb52d00e1f658 Mon Sep 17 00:00:00 2001
From: jinlun <869793317@qq.com>
Date: Sat, 2 Nov 2024 17:21:22 +0800
Subject: [PATCH] Fix the issue that the gBS->LoadImage pointer was empty.
The interface shouldn't be replaced at the shim_fini
stage When the vendor certificate doesn't exist.
Signed-off-by: jinlun <869793317@qq.com>
Signed-off-by: xuce <xuce10@h-partners.com>
---
shim.c | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/shim.c b/shim.c
index 547b052..aa74610 100644
--- a/shim.c
+++ b/shim.c
@@ -1651,11 +1651,12 @@ shim_fini(void)
uninstall_shim_protocols();
if (secure_mode()) {
-
- /*
- * Remove our hooks from system services.
- */
- unhook_system_services();
+ if (vendor_authorized_size || vendor_deauthorized_size) {
+ /*
+ * Remove our hooks from system services.
+ */
+ unhook_system_services();
+ }
}
unhook_exit();
--
2.33.0

6
shim.spec
View File

@ -25,7 +25,7 @@
Name: shim
Version: 15.6
Release: 24
Release: 25
Summary: First-stage UEFI bootloader
ExclusiveArch: x86_64 aarch64
License: BSD
@ -88,6 +88,7 @@ Patch50: backport-CVE-2023-0465.patch
Patch51: backport-CVE-2024-0727.patch
Patch52: backport-Always-clear-SbatLevel-when-Secure-Boot-is-disabled.patch
Patch53: backport-shim-don-t-set-second_stage-to-the-empty-string.patch
Patch54: backport-Fix-the-issue-that-the-gBS-LoadImage-pointer-was-emp.patch
# Feature for shim SMx support
Patch9000:Feature-shim-openssl-add-ec-support.patch
@ -230,6 +231,9 @@ make test
/usr/src/debug/%{name}-%{version}-%{release}/*
%changelog
* Tue Feb 11 2025 fuanan <fuanan3@h-partners.com> -15.6-25
- fix the issue that the gBS->LoadImage pointer was empty.
* Tue Oct 22 2024 fuanan <fuanan3@h-partners.com> -15.6-24
- backport patch from upstream