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.3 KiB
Diff
93 lines
2.3 KiB
Diff
From 550c0e6582b6be09b0af2fb2775a149f51c51bbc Mon Sep 17 00:00:00 2001
|
|
From: Chris Coulson <chris.coulson@canonical.com>
|
|
Date: Wed, 6 Jan 2021 13:54:26 +0000
|
|
Subject: [PATCH 28/46] kern/parser: Refactor grub_parser_split_cmdline()
|
|
cleanup
|
|
|
|
Introduce a common function epilogue used for cleaning up on all
|
|
return paths, which will simplify additional error handling to be
|
|
introduced in a subsequent commit.
|
|
|
|
Signed-off-by: Chris Coulson <chris.coulson@canonical.com>
|
|
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
|
|
---
|
|
grub-core/kern/parser.c | 35 ++++++++++++++++++++---------------
|
|
1 file changed, 20 insertions(+), 15 deletions(-)
|
|
|
|
diff --git a/grub-core/kern/parser.c b/grub-core/kern/parser.c
|
|
index 572c67089..e010eaa1f 100644
|
|
--- a/grub-core/kern/parser.c
|
|
+++ b/grub-core/kern/parser.c
|
|
@@ -221,19 +221,13 @@ grub_parser_split_cmdline (const char *cmdline,
|
|
|
|
if (process_char (*rp, buffer, &bp, varname, &vp, state, argc,
|
|
&newstate) != GRUB_ERR_NONE)
|
|
- {
|
|
- if (rd != cmdline)
|
|
- grub_free (rd);
|
|
- return grub_errno;
|
|
- }
|
|
+ goto fail;
|
|
+
|
|
state = newstate;
|
|
}
|
|
}
|
|
while (state != GRUB_PARSER_STATE_TEXT && !check_varstate (state));
|
|
|
|
- if (rd != cmdline)
|
|
- grub_free (rd);
|
|
-
|
|
/* A special case for when the last character was part of a
|
|
variable. */
|
|
add_var (varname, &bp, &vp, state, GRUB_PARSER_STATE_TEXT);
|
|
@@ -243,20 +237,20 @@ grub_parser_split_cmdline (const char *cmdline,
|
|
|
|
/* If there are no args, then we're done. */
|
|
if (!*argc)
|
|
- return 0;
|
|
+ {
|
|
+ grub_errno = GRUB_ERR_NONE;
|
|
+ goto out;
|
|
+ }
|
|
|
|
/* Reserve memory for the return values. */
|
|
args = grub_malloc (bp - buffer);
|
|
if (!args)
|
|
- return grub_errno;
|
|
+ goto fail;
|
|
grub_memcpy (args, buffer, bp - buffer);
|
|
|
|
*argv = grub_calloc (*argc + 1, sizeof (char *));
|
|
if (!*argv)
|
|
- {
|
|
- grub_free (args);
|
|
- return grub_errno;
|
|
- }
|
|
+ goto fail;
|
|
|
|
/* The arguments are separated with 0's, setup argv so it points to
|
|
the right values. */
|
|
@@ -269,7 +263,18 @@ grub_parser_split_cmdline (const char *cmdline,
|
|
bp++;
|
|
}
|
|
|
|
- return 0;
|
|
+ grub_errno = GRUB_ERR_NONE;
|
|
+
|
|
+ out:
|
|
+ if (rd != cmdline)
|
|
+ grub_free (rd);
|
|
+
|
|
+ return grub_errno;
|
|
+
|
|
+ fail:
|
|
+ grub_free (*argv);
|
|
+ grub_free (args);
|
|
+ goto out;
|
|
}
|
|
|
|
/* Helper for grub_parser_execute. */
|
|
--
|
|
2.26.2
|
|
|