8e6824ec91
We add patches to fix CVEs for grub instead of upgrading because grub2/grub-efi is ported from yocto for secure boot bringing up. The patches for CVE-2022-28736 have conflicts with the patches for secure boot. So refer to below link to fix this CVE: (1) https://patchwork.yoctoproject.org/project/oe-core/patch/ 20221207034254.58292-1-xiangyu.chen@eng.windriver.com/ (2)https://github.com/jiazhang0/meta-secure-core/pull/257 The special patches for grub-efi are from layers meta-lat and meta-secure-core of yocto upstream, which are based on the patches for grub-efi in oe-core layer (including CVE patches). We used to mix all the patches together. Now we will move the patches from meta-lat and meta-secure-core to the end of sequence for applying patches, so that we can keep align with yocto upstream and make it easier to maintain the grub here. Since there are many patches involved here, we don't change the number in patches' name in case confusion is caused if we rename many files. Below commits are added for the CVE: <loader/efi/chainloader: Simplify the loader state> <commands/boot: Add API to pass context to loader> <loader/efi/chainloader: Use grub_loader_set_ex()> Below patches for secure boot are adapted for conflicts with above: secure-core/0009 <efi: chainloader: port shim to grub> secure-core/0010 <efi: chainloader: use shim to load and verify an image> secure-core/0012 <efi: chainloader: take care of unload undershim> All of them are aligned with upstream and no changes here. Test plan: - PASS: build grub2/grub-efi. - PASS: build-image and install and boot up on lab/qemu. - PASS: check that the "stx.N" version number is right for both bios(grub2 ver) and uefi(grub-efi ver) boot. - PASS: the tests are done on lab with secure boot disabled and enabled. Closes-Bug: #2034119 Signed-off-by: Li Zhou <li.zhou@windriver.com> Change-Id: I9a37cd8b804b238407f8ac6528f087a2eb0cf2de
64 lines
2.4 KiB
Diff
64 lines
2.4 KiB
Diff
From 9645bb29a0ffb93c854cbeed175c62775ba38bb7 Mon Sep 17 00:00:00 2001
|
|
From: Ricardo Neri <ricardo.neri-calderon@linux.intel.com>
|
|
Date: Fri, 27 Mar 2015 08:29:13 -0700
|
|
Subject: [PATCH] efi: chainloader: boot the image using shim
|
|
|
|
Upstream-Status: Inappropriate [embedded specific]
|
|
|
|
If the image was loaded using shim, boot the image. Given that
|
|
shim loaded the image, the UEFI firmware will not know where to
|
|
jump after the execution completes. Thus, replace the UEFI boot
|
|
service Exit with our own implementation to make sure we jump
|
|
to the instruction after the call to the entry point.
|
|
|
|
Replace the system Exit service when done.
|
|
|
|
Signed-off-by: Ricardo Neri <ricardo.neri-calderon@linux.intel.com>
|
|
---
|
|
grub-core/loader/efi/chainloader.c | 27 ++++++++++++++++++++++++++-
|
|
1 file changed, 26 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/grub-core/loader/efi/chainloader.c b/grub-core/loader/efi/chainloader.c
|
|
index 121af25..adaf3c9 100644
|
|
--- a/grub-core/loader/efi/chainloader.c
|
|
+++ b/grub-core/loader/efi/chainloader.c
|
|
@@ -609,9 +609,34 @@ grub_chainloader_boot (void)
|
|
grub_efi_status_t status;
|
|
grub_efi_uintn_t exit_data_size;
|
|
grub_efi_char16_t *exit_data = NULL;
|
|
+ grub_efi_loaded_image_t *loaded_image = NULL;
|
|
+ grub_efi_status_t
|
|
+ (*saved_exit) (grub_efi_handle_t image_handle,
|
|
+ grub_efi_status_t exit_status,
|
|
+ grub_efi_uintn_t exit_data_size,
|
|
+ grub_efi_char16_t *exit_data) __attribute__((noreturn));
|
|
|
|
b = grub_efi_system_table->boot_services;
|
|
- status = efi_call_3 (b->start_image, image_handle, &exit_data_size, &exit_data);
|
|
+
|
|
+ if (!shim_used)
|
|
+ status = efi_call_3 (b->start_image, image_handle, &exit_data_size, &exit_data);
|
|
+ else
|
|
+ {
|
|
+ saved_exit = grub_efi_system_table->boot_services->exit;
|
|
+ grub_efi_system_table->boot_services->exit = efi_shim_exit;
|
|
+ status = efi_call_foo(shim_entry_point,
|
|
+ (grub_efi_uint64_t)grub_efi_image_handle,
|
|
+ (grub_efi_uint64_t)grub_efi_system_table);
|
|
+ grub_efi_system_table->boot_services->exit = saved_exit;
|
|
+
|
|
+ loaded_image = grub_efi_get_loaded_image (grub_efi_image_handle);
|
|
+ if (!loaded_image)
|
|
+ /* TODO: this is serious, what to do? */
|
|
+ grub_error (GRUB_ERR_BAD_OS, "GRUB loaded image not found");
|
|
+ else
|
|
+ /* restore loaded image */
|
|
+ grub_memcpy(loaded_image, &shim_li_bak, sizeof(shim_li_bak));
|
|
+ }
|
|
if (status != GRUB_EFI_SUCCESS)
|
|
{
|
|
if (exit_data)
|
|
--
|
|
2.17.1
|
|
|