forked from pool/grub2
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
55 lines
1.6 KiB
Diff
55 lines
1.6 KiB
Diff
From fafede32c0ed3bc1953c5663b58036a58fb7b6bd Mon Sep 17 00:00:00 2001
|
|
From: Daniel Axtens <dja@axtens.net>
|
|
Date: Fri, 22 Jan 2021 16:07:29 +1100
|
|
Subject: [PATCH 22/46] lib/arg: Block repeated short options that require an
|
|
argument
|
|
|
|
Fuzzing found the following crash:
|
|
|
|
search -hhhhhhhhhhhhhf
|
|
|
|
We didn't allocate enough option space for 13 hints because the
|
|
allocation code counts the number of discrete arguments (i.e. argc).
|
|
However, the shortopt parsing code will happily keep processing
|
|
a combination of short options without checking if those short
|
|
options require an argument. This means you can easily end writing
|
|
past the allocated option space.
|
|
|
|
This fixes a OOB write which can cause heap corruption.
|
|
|
|
Fixes: CVE-2021-20225
|
|
|
|
Signed-off-by: Daniel Axtens <dja@axtens.net>
|
|
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
|
|
---
|
|
grub-core/lib/arg.c | 13 +++++++++++++
|
|
1 file changed, 13 insertions(+)
|
|
|
|
diff --git a/grub-core/lib/arg.c b/grub-core/lib/arg.c
|
|
index 3288609a5..537c5e94b 100644
|
|
--- a/grub-core/lib/arg.c
|
|
+++ b/grub-core/lib/arg.c
|
|
@@ -299,6 +299,19 @@ grub_arg_parse (grub_extcmd_t cmd, int argc, char **argv,
|
|
it can have an argument value. */
|
|
if (*curshort)
|
|
{
|
|
+ /*
|
|
+ * Only permit further short opts if this one doesn't
|
|
+ * require a value.
|
|
+ */
|
|
+ if (opt->type != ARG_TYPE_NONE &&
|
|
+ !(opt->flags & GRUB_ARG_OPTION_OPTIONAL))
|
|
+ {
|
|
+ grub_error (GRUB_ERR_BAD_ARGUMENT,
|
|
+ N_("missing mandatory option for `%s'"),
|
|
+ opt->longarg);
|
|
+ goto fail;
|
|
+ }
|
|
+
|
|
if (parse_option (cmd, opt, 0, usr) || grub_errno)
|
|
goto fail;
|
|
}
|
|
--
|
|
2.26.2
|
|
|