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
66 lines
1.9 KiB
Diff
66 lines
1.9 KiB
Diff
From b4086b4baa1412fc962b9f88aa5e2a982afee0da Mon Sep 17 00:00:00 2001
|
|
From: Chris Coulson <chris.coulson@canonical.com>
|
|
Date: Thu, 7 Jan 2021 19:53:55 +0000
|
|
Subject: [PATCH 27/46] kern/parser: Introduce terminate_arg() helper
|
|
|
|
process_char() and grub_parser_split_cmdline() use similar code for
|
|
terminating the most recent argument. Add a helper function for this.
|
|
|
|
Signed-off-by: Chris Coulson <chris.coulson@canonical.com>
|
|
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
|
|
---
|
|
grub-core/kern/parser.c | 23 +++++++++++++----------
|
|
1 file changed, 13 insertions(+), 10 deletions(-)
|
|
|
|
diff --git a/grub-core/kern/parser.c b/grub-core/kern/parser.c
|
|
index 0d3582bd8..572c67089 100644
|
|
--- a/grub-core/kern/parser.c
|
|
+++ b/grub-core/kern/parser.c
|
|
@@ -129,6 +129,16 @@ add_var (char *varname, char **bp, char **vp,
|
|
*((*bp)++) = *val;
|
|
}
|
|
|
|
+static void
|
|
+terminate_arg (char *buffer, char **bp, int *argc)
|
|
+{
|
|
+ if (*bp != buffer && *((*bp) - 1) != '\0')
|
|
+ {
|
|
+ *((*bp)++) = '\0';
|
|
+ (*argc)++;
|
|
+ }
|
|
+}
|
|
+
|
|
static grub_err_t
|
|
process_char (char c, char *buffer, char **bp, char *varname, char **vp,
|
|
grub_parser_state_t state, int *argc,
|
|
@@ -157,11 +167,7 @@ process_char (char c, char *buffer, char **bp, char *varname, char **vp,
|
|
* Don't add more than one argument if multiple
|
|
* spaces are used.
|
|
*/
|
|
- if (*bp != buffer && *((*bp) - 1) != '\0')
|
|
- {
|
|
- *((*bp)++) = '\0';
|
|
- (*argc)++;
|
|
- }
|
|
+ terminate_arg (buffer, bp, argc);
|
|
}
|
|
else if (use)
|
|
*((*bp)++) = use;
|
|
@@ -232,11 +238,8 @@ grub_parser_split_cmdline (const char *cmdline,
|
|
variable. */
|
|
add_var (varname, &bp, &vp, state, GRUB_PARSER_STATE_TEXT);
|
|
|
|
- if (bp != buffer && *(bp - 1))
|
|
- {
|
|
- *(bp++) = '\0';
|
|
- (*argc)++;
|
|
- }
|
|
+ /* Ensure that the last argument is terminated. */
|
|
+ terminate_arg (buffer, &bp, argc);
|
|
|
|
/* If there are no args, then we're done. */
|
|
if (!*argc)
|
|
--
|
|
2.26.2
|
|
|