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
77 lines
2.1 KiB
Diff
77 lines
2.1 KiB
Diff
From b6e9ddb100e90665d090d7f92cdc69f03f0a6498 Mon Sep 17 00:00:00 2001
|
|
From: Chris Coulson <chris.coulson@canonical.com>
|
|
Date: Wed, 18 Nov 2020 00:59:24 +0000
|
|
Subject: [PATCH 25/46] kern/parser: Fix a memory leak
|
|
|
|
The getline() function supplied to grub_parser_split_cmdline() returns
|
|
a newly allocated buffer and can be called multiple times, but the
|
|
returned buffer is never freed.
|
|
|
|
Signed-off-by: Chris Coulson <chris.coulson@canonical.com>
|
|
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
|
|
---
|
|
grub-core/kern/parser.c | 20 ++++++++++++++++----
|
|
1 file changed, 16 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/grub-core/kern/parser.c b/grub-core/kern/parser.c
|
|
index d1cf061ad..39e4df65b 100644
|
|
--- a/grub-core/kern/parser.c
|
|
+++ b/grub-core/kern/parser.c
|
|
@@ -140,6 +140,7 @@ grub_parser_split_cmdline (const char *cmdline,
|
|
char buffer[1024];
|
|
char *bp = buffer;
|
|
char *rd = (char *) cmdline;
|
|
+ char *rp = rd;
|
|
char varname[200];
|
|
char *vp = varname;
|
|
char *args;
|
|
@@ -149,10 +150,18 @@ grub_parser_split_cmdline (const char *cmdline,
|
|
*argv = NULL;
|
|
do
|
|
{
|
|
- if (!rd || !*rd)
|
|
+ if (rp == NULL || *rp == '\0')
|
|
{
|
|
+ if (rd != cmdline)
|
|
+ {
|
|
+ grub_free (rd);
|
|
+ rd = rp = NULL;
|
|
+ }
|
|
if (getline)
|
|
- getline (&rd, 1, getline_data);
|
|
+ {
|
|
+ getline (&rd, 1, getline_data);
|
|
+ rp = rd;
|
|
+ }
|
|
else
|
|
break;
|
|
}
|
|
@@ -160,12 +169,12 @@ grub_parser_split_cmdline (const char *cmdline,
|
|
if (!rd)
|
|
break;
|
|
|
|
- for (; *rd; rd++)
|
|
+ for (; *rp != '\0'; rp++)
|
|
{
|
|
grub_parser_state_t newstate;
|
|
char use;
|
|
|
|
- newstate = grub_parser_cmdline_state (state, *rd, &use);
|
|
+ newstate = grub_parser_cmdline_state (state, *rp, &use);
|
|
|
|
/* If a variable was being processed and this character does
|
|
not describe the variable anymore, write the variable to
|
|
@@ -198,6 +207,9 @@ grub_parser_split_cmdline (const char *cmdline,
|
|
}
|
|
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);
|
|
--
|
|
2.26.2
|
|
|