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
85 lines
2.8 KiB
Diff
85 lines
2.8 KiB
Diff
From 427bbc05c7fe8c01872cdba3d1d59d27fc1b9e5b Mon Sep 17 00:00:00 2001
|
|
From: Dimitri John Ledkov <xnox@ubuntu.com>
|
|
Date: Mon, 22 Feb 2021 17:05:25 +0000
|
|
Subject: [PATCH 39/46] grub-install-common: Add --sbat option
|
|
|
|
Signed-off-by: Dimitri John Ledkov <xnox@ubuntu.com>
|
|
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
|
|
---
|
|
include/grub/util/install.h | 5 ++++-
|
|
util/grub-install-common.c | 12 ++++++++++--
|
|
2 files changed, 14 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/include/grub/util/install.h b/include/grub/util/install.h
|
|
index 6ee3b4516..2207b54d7 100644
|
|
--- a/include/grub/util/install.h
|
|
+++ b/include/grub/util/install.h
|
|
@@ -63,6 +63,8 @@
|
|
/* TRANSLATORS: "embed" is a verb (command description). "*/ \
|
|
{ "pubkey", 'k', N_("FILE"), 0, \
|
|
N_("embed FILE as public key for signature checking"), 0}, \
|
|
+ { "sbat", GRUB_INSTALL_OPTIONS_SBAT, N_("FILE"), 0, \
|
|
+ N_("SBAT metadata"), 0 }, \
|
|
{ "verbose", 'v', 0, 0, \
|
|
N_("print verbose messages."), 1 }
|
|
|
|
@@ -123,7 +125,8 @@ enum grub_install_options {
|
|
GRUB_INSTALL_OPTIONS_THEMES_DIRECTORY,
|
|
GRUB_INSTALL_OPTIONS_GRUB_MKIMAGE,
|
|
GRUB_INSTALL_OPTIONS_INSTALL_CORE_COMPRESS,
|
|
- GRUB_INSTALL_OPTIONS_DTB
|
|
+ GRUB_INSTALL_OPTIONS_DTB,
|
|
+ GRUB_INSTALL_OPTIONS_SBAT
|
|
};
|
|
|
|
extern char *grub_install_source_directory;
|
|
diff --git a/util/grub-install-common.c b/util/grub-install-common.c
|
|
index 052f3ef3d..4efee002f 100644
|
|
--- a/util/grub-install-common.c
|
|
+++ b/util/grub-install-common.c
|
|
@@ -342,6 +342,7 @@ handle_install_list (struct install_list *il, const char *val,
|
|
|
|
static char **pubkeys;
|
|
static size_t npubkeys;
|
|
+static char *sbat;
|
|
static grub_compression_t compression;
|
|
|
|
int
|
|
@@ -372,6 +373,12 @@ grub_install_parse (int key, char *arg)
|
|
* (npubkeys + 1));
|
|
pubkeys[npubkeys++] = xstrdup (arg);
|
|
return 1;
|
|
+ case GRUB_INSTALL_OPTIONS_SBAT:
|
|
+ if (sbat)
|
|
+ free (sbat);
|
|
+
|
|
+ sbat = xstrdup (arg);
|
|
+ return 1;
|
|
|
|
case GRUB_INSTALL_OPTIONS_VERBOSITY:
|
|
verbosity++;
|
|
@@ -533,9 +540,10 @@ grub_install_make_image_wrap_file (const char *dir, const char *prefix,
|
|
grub_util_info ("grub-mkimage --directory '%s' --prefix '%s'"
|
|
" --output '%s' "
|
|
" --dtb '%s' "
|
|
+ "--sbat '%s' "
|
|
"--format '%s' --compression '%s' %s %s\n",
|
|
dir, prefix,
|
|
- outname, dtb ? : "", mkimage_target,
|
|
+ outname, dtb ? : "", sbat ? : "", mkimage_target,
|
|
compnames[compression], note ? "--note" : "", s);
|
|
free (s);
|
|
|
|
@@ -546,7 +554,7 @@ grub_install_make_image_wrap_file (const char *dir, const char *prefix,
|
|
grub_install_generate_image (dir, prefix, fp, outname,
|
|
modules.entries, memdisk_path,
|
|
pubkeys, npubkeys, config_path, tgt,
|
|
- note, compression, dtb, NULL);
|
|
+ note, compression, dtb, sbat);
|
|
while (dc--)
|
|
grub_install_pop_module ();
|
|
}
|
|
--
|
|
2.26.2
|
|
|