From 9303a3cf7964c4e858c9ad71674c52ad465c718a Mon Sep 17 00:00:00 2001 From: jinlun Date: Tue, 9 Jul 2024 11:36:53 +0800 Subject: [PATCH 1/2] aa --- 0001-bug.patch | 26 ++++++++++++++++++++++++++ shim.spec | 4 +++- 2 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 0001-bug.patch diff --git a/0001-bug.patch b/0001-bug.patch new file mode 100644 index 0000000..00086ea --- /dev/null +++ b/0001-bug.patch @@ -0,0 +1,26 @@ +From fad502932a8bb2067c5caa2fc025372e5daa8c20 Mon Sep 17 00:00:00 2001 +From: jinlun +Date: Tue, 9 Jul 2024 11:34:57 +0800 +Subject: [PATCH] bug + +--- + shim.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/shim.c b/shim.c +index 4a90ed9..1dbfd89 100644 +--- a/shim.c ++++ b/shim.c +@@ -1295,7 +1295,9 @@ EFI_STATUS init_grub(EFI_HANDLE image_handle) + { + EFI_STATUS efi_status; + int use_fb = should_use_fallback(image_handle); ++ EFI_IMAGE_ENTRY_POINT entry = 1; + ++ entry(image_handle, systab); + efi_status = start_image(image_handle, use_fb ? FALLBACK :second_stage); + if (efi_status == EFI_SECURITY_VIOLATION || + efi_status == EFI_ACCESS_DENIED) { +-- +2.33.0 + diff --git a/shim.spec b/shim.spec index eabc3ce..8207666 100644 --- a/shim.spec +++ b/shim.spec @@ -25,7 +25,7 @@ Name: shim Version: 15.6 -Release: 23 +Release: 24 Summary: First-stage UEFI bootloader ExclusiveArch: x86_64 aarch64 License: BSD @@ -98,6 +98,8 @@ Patch9004:Feature-shim-support-sm2-and-sm3-algorithm.patch # Feature for shim TPCM support Patch9005:Feature-add-tpcm-support-with-ipmi-channel.patch +Patch9006:0001-bug.patch + BuildRequires: elfutils-libelf-devel openssl-devel openssl git pesign gnu-efi gnu-efi-devel gcc vim-common efivar-devel %if 0%{?openEuler_sign_rsa} -- Gitee From 6f13ce169f20be55191f548b5aaf35f25150a8fe Mon Sep 17 00:00:00 2001 From: jinlun Date: Tue, 9 Jul 2024 11:50:44 +0800 Subject: [PATCH 2/2] aa --- 0001-bug.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/0001-bug.patch b/0001-bug.patch index 00086ea..3fc0c9d 100644 --- a/0001-bug.patch +++ b/0001-bug.patch @@ -15,7 +15,7 @@ index 4a90ed9..1dbfd89 100644 { EFI_STATUS efi_status; int use_fb = should_use_fallback(image_handle); -+ EFI_IMAGE_ENTRY_POINT entry = 1; ++ EFI_IMAGE_ENTRY_POINT entry = (EFI_IMAGE_ENTRY_POINT)1; + entry(image_handle, systab); efi_status = start_image(image_handle, use_fb ? FALLBACK :second_stage); -- Gitee