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
76 lines
2.7 KiB
Diff
76 lines
2.7 KiB
Diff
From 08c63ad119ce0c0d0de56d9878f0be6811f623d4 Mon Sep 17 00:00:00 2001
|
|
From: Javier Martinez Canillas <javierm@redhat.com>
|
|
Date: Mon, 28 Sep 2020 20:08:41 +0200
|
|
Subject: [PATCH 13/46] acpi: Don't register the acpi command when locked down
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
The command is not allowed when lockdown is enforced. Otherwise an
|
|
attacker can instruct the GRUB to load an SSDT table to overwrite
|
|
the kernel lockdown configuration and later load and execute
|
|
unsigned code.
|
|
|
|
Fixes: CVE-2020-14372
|
|
|
|
Reported-by: Máté Kukri <km@mkukri.xyz>
|
|
Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
|
|
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
|
|
---
|
|
docs/grub.texi | 5 +++++
|
|
grub-core/commands/acpi.c | 15 ++++++++-------
|
|
2 files changed, 13 insertions(+), 7 deletions(-)
|
|
|
|
diff --git a/docs/grub.texi b/docs/grub.texi
|
|
index 6d8d32b0b..2ee8721a1 100644
|
|
--- a/docs/grub.texi
|
|
+++ b/docs/grub.texi
|
|
@@ -3986,6 +3986,11 @@ Normally, this command will replace the Root System Description Pointer
|
|
(RSDP) in the Extended BIOS Data Area to point to the new tables. If the
|
|
@option{--no-ebda} option is used, the new tables will be known only to
|
|
GRUB, but may be used by GRUB's EFI emulation.
|
|
+
|
|
+Note: The command is not allowed when lockdown is enforced (@pxref{Lockdown}).
|
|
+ Otherwise an attacker can instruct the GRUB to load an SSDT table to
|
|
+ overwrite the kernel lockdown configuration and later load and execute
|
|
+ unsigned code.
|
|
@end deffn
|
|
|
|
|
|
diff --git a/grub-core/commands/acpi.c b/grub-core/commands/acpi.c
|
|
index 5a1499aa0..1215f2a62 100644
|
|
--- a/grub-core/commands/acpi.c
|
|
+++ b/grub-core/commands/acpi.c
|
|
@@ -27,6 +27,7 @@
|
|
#include <grub/mm.h>
|
|
#include <grub/memory.h>
|
|
#include <grub/i18n.h>
|
|
+#include <grub/lockdown.h>
|
|
|
|
#ifdef GRUB_MACHINE_EFI
|
|
#include <grub/efi/efi.h>
|
|
@@ -775,13 +776,13 @@ static grub_extcmd_t cmd;
|
|
|
|
GRUB_MOD_INIT(acpi)
|
|
{
|
|
- cmd = grub_register_extcmd ("acpi", grub_cmd_acpi, 0,
|
|
- N_("[-1|-2] [--exclude=TABLE1,TABLE2|"
|
|
- "--load-only=TABLE1,TABLE2] FILE1"
|
|
- " [FILE2] [...]"),
|
|
- N_("Load host ACPI tables and tables "
|
|
- "specified by arguments."),
|
|
- options);
|
|
+ cmd = grub_register_extcmd_lockdown ("acpi", grub_cmd_acpi, 0,
|
|
+ N_("[-1|-2] [--exclude=TABLE1,TABLE2|"
|
|
+ "--load-only=TABLE1,TABLE2] FILE1"
|
|
+ " [FILE2] [...]"),
|
|
+ N_("Load host ACPI tables and tables "
|
|
+ "specified by arguments."),
|
|
+ options);
|
|
}
|
|
|
|
GRUB_MOD_FINI(acpi)
|
|
--
|
|
2.26.2
|
|
|