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
51 lines
1.5 KiB
Diff
51 lines
1.5 KiB
Diff
From 61aebf1dd8213cd8e3d4b3493f4bb4c221331c17 Mon Sep 17 00:00:00 2001
|
|
From: Darren Kenny <darren.kenny@oracle.com>
|
|
Date: Fri, 22 Jan 2021 12:32:41 +0000
|
|
Subject: [PATCH 24/46] kern/parser: Fix resource leak if argc == 0
|
|
|
|
After processing the command-line yet arriving at the point where we are
|
|
setting argv, we are allocating memory, even if argc == 0, which makes
|
|
no sense since we never put anything into the allocated argv.
|
|
|
|
The solution is to simply return that we've successfully processed the
|
|
arguments but that argc == 0, and also ensure that argv is NULL when
|
|
we're not allocating anything in it.
|
|
|
|
There are only 2 callers of this function, and both are handling a zero
|
|
value in argc assuming nothing is allocated in argv.
|
|
|
|
Fixes: CID 96680
|
|
|
|
Signed-off-by: Darren Kenny <darren.kenny@oracle.com>
|
|
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
|
|
---
|
|
grub-core/kern/parser.c | 5 +++++
|
|
1 file changed, 5 insertions(+)
|
|
|
|
diff --git a/grub-core/kern/parser.c b/grub-core/kern/parser.c
|
|
index 619db3122..d1cf061ad 100644
|
|
--- a/grub-core/kern/parser.c
|
|
+++ b/grub-core/kern/parser.c
|
|
@@ -146,6 +146,7 @@ grub_parser_split_cmdline (const char *cmdline,
|
|
int i;
|
|
|
|
*argc = 0;
|
|
+ *argv = NULL;
|
|
do
|
|
{
|
|
if (!rd || !*rd)
|
|
@@ -207,6 +208,10 @@ grub_parser_split_cmdline (const char *cmdline,
|
|
(*argc)++;
|
|
}
|
|
|
|
+ /* If there are no args, then we're done. */
|
|
+ if (!*argc)
|
|
+ return 0;
|
|
+
|
|
/* Reserve memory for the return values. */
|
|
args = grub_malloc (bp - buffer);
|
|
if (!args)
|
|
--
|
|
2.26.2
|
|
|