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
61 lines
2.5 KiB
Diff
61 lines
2.5 KiB
Diff
From da75051bd36ce97b94254f17a6a94b5cbdf77d48 Mon Sep 17 00:00:00 2001
|
|
From: Javier Martinez Canillas <javierm@redhat.com>
|
|
Date: Wed, 24 Feb 2021 14:44:38 +0100
|
|
Subject: [PATCH 19/46] loader/xnu: Don't allow loading extension and packages
|
|
when locked down
|
|
|
|
The shim_lock verifier validates the XNU kernels but no its extensions
|
|
and packages. Prevent these to be loaded when the GRUB is locked down.
|
|
|
|
Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
|
|
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
|
|
---
|
|
grub-core/loader/xnu.c | 31 +++++++++++++++++--------------
|
|
1 file changed, 17 insertions(+), 14 deletions(-)
|
|
|
|
diff --git a/grub-core/loader/xnu.c b/grub-core/loader/xnu.c
|
|
index 77d7060e1..07232d2a1 100644
|
|
--- a/grub-core/loader/xnu.c
|
|
+++ b/grub-core/loader/xnu.c
|
|
@@ -1482,20 +1482,23 @@ GRUB_MOD_INIT(xnu)
|
|
N_("Load XNU image."));
|
|
cmd_kernel64 = grub_register_command ("xnu_kernel64", grub_cmd_xnu_kernel64,
|
|
0, N_("Load 64-bit XNU image."));
|
|
- cmd_mkext = grub_register_command ("xnu_mkext", grub_cmd_xnu_mkext, 0,
|
|
- N_("Load XNU extension package."));
|
|
- cmd_kext = grub_register_command ("xnu_kext", grub_cmd_xnu_kext, 0,
|
|
- N_("Load XNU extension."));
|
|
- cmd_kextdir = grub_register_command ("xnu_kextdir", grub_cmd_xnu_kextdir,
|
|
- /* TRANSLATORS: OSBundleRequired is a
|
|
- variable name in xnu extensions
|
|
- manifests. It behaves mostly like
|
|
- GNU/Linux runlevels.
|
|
- */
|
|
- N_("DIRECTORY [OSBundleRequired]"),
|
|
- /* TRANSLATORS: There are many extensions
|
|
- in extension directory. */
|
|
- N_("Load XNU extension directory."));
|
|
+ cmd_mkext = grub_register_command_lockdown ("xnu_mkext", grub_cmd_xnu_mkext, 0,
|
|
+ N_("Load XNU extension package."));
|
|
+ cmd_kext = grub_register_command_lockdown ("xnu_kext", grub_cmd_xnu_kext, 0,
|
|
+ N_("Load XNU extension."));
|
|
+ cmd_kextdir = grub_register_command_lockdown ("xnu_kextdir", grub_cmd_xnu_kextdir,
|
|
+ /*
|
|
+ * TRANSLATORS: OSBundleRequired is
|
|
+ * a variable name in xnu extensions
|
|
+ * manifests. It behaves mostly like
|
|
+ * GNU/Linux runlevels.
|
|
+ */
|
|
+ N_("DIRECTORY [OSBundleRequired]"),
|
|
+ /*
|
|
+ * TRANSLATORS: There are many extensions
|
|
+ * in extension directory.
|
|
+ */
|
|
+ N_("Load XNU extension directory."));
|
|
cmd_ramdisk = grub_register_command ("xnu_ramdisk", grub_cmd_xnu_ramdisk, 0,
|
|
/* TRANSLATORS: ramdisk here isn't identifier. It can be translated. */
|
|
N_("Load XNU ramdisk. "
|
|
--
|
|
2.26.2
|
|
|