be3181b1eb
- VUL-0: grub2,shim: implement new SBAT method (bsc#1182057) * 0031-util-mkimage-Remove-unused-code-to-add-BSS-section.patch * 0032-util-mkimage-Use-grub_host_to_target32-instead-of-gr.patch * 0033-util-mkimage-Always-use-grub_host_to_target32-to-ini.patch * 0034-util-mkimage-Unify-more-of-the-PE32-and-PE32-header-.patch * 0035-util-mkimage-Reorder-PE-optional-header-fields-set-u.patch * 0036-util-mkimage-Improve-data_size-value-calculation.patch * 0037-util-mkimage-Refactor-section-setup-to-use-a-helper.patch * 0038-util-mkimage-Add-an-option-to-import-SBAT-metadata-i.patch * 0039-grub-install-common-Add-sbat-option.patch - Fix CVE-2021-20225 (bsc#1182262) * 0022-lib-arg-Block-repeated-short-options-that-require-an.patch - Fix CVE-2020-27749 (bsc#1179264) * 0024-kern-parser-Fix-resource-leak-if-argc-0.patch * 0025-kern-parser-Fix-a-memory-leak.patch * 0026-kern-parser-Introduce-process_char-helper.patch * 0027-kern-parser-Introduce-terminate_arg-helper.patch * 0028-kern-parser-Refactor-grub_parser_split_cmdline-clean.patch * 0029-kern-buffer-Add-variable-sized-heap-buffer.patch * 0030-kern-parser-Fix-a-stack-buffer-overflow.patch - Fix CVE-2021-20233 (bsc#1182263) * 0023-commands-menuentry-Fix-quoting-in-setparams_prefix.patch - Fix CVE-2020-25647 (bsc#1177883) * 0021-usb-Avoid-possible-out-of-bound-accesses-caused-by-m.patch - Fix CVE-2020-25632 (bsc#1176711) * 0020-dl-Only-allow-unloading-modules-that-are-not-depende.patch - Fix CVE-2020-27779, CVE-2020-14372 (bsc#1179265) (bsc#1175970) * 0001-include-grub-i386-linux.h-Include-missing-grub-types.patch * 0002-efi-Make-shim_lock-GUID-and-protocol-type-public.patch * 0003-efi-Return-grub_efi_status_t-from-grub_efi_get_varia.patch OBS-URL: https://build.opensuse.org/request/show/876326 OBS-URL: https://build.opensuse.org/package/show/Base:System/grub2?expand=0&rev=374
93 lines
2.6 KiB
Diff
93 lines
2.6 KiB
Diff
From 50f063f61eec3a99565db5f964970a872b642b27 Mon Sep 17 00:00:00 2001
|
|
From: Michael Chang <mchang@suse.com>
|
|
Date: Fri, 11 Dec 2020 22:33:52 +0800
|
|
Subject: [PATCH 41/46] squash! Add secureboot support on efi chainloader
|
|
|
|
Use grub_efi_get_secureboot to get secure boot status
|
|
---
|
|
grub-core/loader/efi/chainloader.c | 54 ++----------------------------
|
|
1 file changed, 2 insertions(+), 52 deletions(-)
|
|
|
|
diff --git a/grub-core/loader/efi/chainloader.c b/grub-core/loader/efi/chainloader.c
|
|
index 8272df3cd..559247abf 100644
|
|
--- a/grub-core/loader/efi/chainloader.c
|
|
+++ b/grub-core/loader/efi/chainloader.c
|
|
@@ -46,6 +46,7 @@
|
|
|
|
#ifdef SUPPORT_SECURE_BOOT
|
|
#include <grub/efi/pe32.h>
|
|
+#include <grub/efi/sb.h>
|
|
#endif
|
|
|
|
GRUB_MOD_LICENSE ("GPLv3+");
|
|
@@ -282,57 +283,6 @@ grub_secure_validate (void *data, grub_efi_uint32_t size)
|
|
return 0;
|
|
}
|
|
|
|
-static grub_efi_boolean_t
|
|
-grub_secure_mode (void)
|
|
-{
|
|
- grub_efi_guid_t efi_var_guid = GRUB_EFI_GLOBAL_VARIABLE_GUID;
|
|
- grub_uint8_t *data;
|
|
- grub_size_t datasize;
|
|
-
|
|
- data = grub_efi_get_variable ("SecureBoot", &efi_var_guid, &datasize);
|
|
-
|
|
- if (data)
|
|
- {
|
|
- grub_dprintf ("chain", "SecureBoot: %d, datasize %d\n", (int)*data, (int)datasize);
|
|
- }
|
|
-
|
|
- if (data && (datasize == 1))
|
|
- {
|
|
- if (*data != 1)
|
|
- {
|
|
- grub_dprintf ("chain", "secure boot not enabled\n");
|
|
- return 0;
|
|
- }
|
|
- }
|
|
- else
|
|
- {
|
|
- grub_dprintf ("chain", "unknown secure boot status\n");
|
|
- return 0;
|
|
- }
|
|
-
|
|
- grub_free (data);
|
|
-
|
|
- data = grub_efi_get_variable ("SetupMode", &efi_var_guid, &datasize);
|
|
-
|
|
- if (data)
|
|
- {
|
|
- grub_dprintf ("chain", "SetupMode: %d, datasize %d\n", (int)*data, (int)datasize);
|
|
- }
|
|
-
|
|
- if (data && (datasize == 1))
|
|
- {
|
|
- if (*data == 1)
|
|
- {
|
|
- grub_dprintf ("chain", "platform in setup mode\n");
|
|
- return 0;
|
|
- }
|
|
- }
|
|
-
|
|
- grub_free (data);
|
|
-
|
|
- return 1;
|
|
-}
|
|
-
|
|
static grub_efi_boolean_t
|
|
read_header (void *data, grub_efi_uint32_t size, pe_coff_loader_image_context_t *context)
|
|
{
|
|
@@ -837,7 +787,7 @@ grub_cmd_chainloader (grub_command_t cmd __attribute__ ((unused)),
|
|
|
|
#ifdef SUPPORT_SECURE_BOOT
|
|
/* FIXME is secure boot possible also with universal binaries? */
|
|
- if (debug_secureboot || (grub_secure_mode() && grub_secure_validate ((void *)address, fsize)))
|
|
+ if (debug_secureboot || (grub_efi_get_secureboot () == GRUB_EFI_SECUREBOOT_MODE_ENABLED && grub_secure_validate ((void *)address, fsize)))
|
|
{
|
|
grub_file_close (file);
|
|
grub_loader_set (grub_secureboot_chainloader_boot, grub_secureboot_chainloader_unload, 0);
|
|
--
|
|
2.26.2
|
|
|