1From 49bf3faa106498e151306fc780c63194a14751e3 Mon Sep 17 00:00:00 2001
2From: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
3Date: Fri, 26 Jun 2020 10:51:43 -0400
4Subject: [PATCH] multiboot2: Fix memory leak if
5 grub_create_loader_cmdline() fails
6MIME-Version: 1.0
7Content-Type: text/plain; charset=UTF-8
8Content-Transfer-Encoding: 8bit
9
10Fixes: CID 292468
11
12Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
13Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
14Signed-off-by: Stefan Sørensen <stefan.sorensen@spectralink.com>
15---
16 grub-core/loader/multiboot_mbi2.c | 6 +++++-
17 1 file changed, 5 insertions(+), 1 deletion(-)
18
19diff --git a/grub-core/loader/multiboot_mbi2.c b/grub-core/loader/multiboot_mbi2.c
20index 53da78615..0efc66062 100644
21--- a/grub-core/loader/multiboot_mbi2.c
22+++ b/grub-core/loader/multiboot_mbi2.c
23@@ -1070,7 +1070,11 @@ grub_multiboot2_add_module (grub_addr_t start, grub_size_t size,
24   err = grub_create_loader_cmdline (argc, argv, newmod->cmdline,
25 				    newmod->cmdline_size, GRUB_VERIFY_MODULE_CMDLINE);
26   if (err)
27-    return err;
28+    {
29+      grub_free (newmod->cmdline);
30+      grub_free (newmod);
31+      return err;
32+    }
33
34   if (modules_last)
35     modules_last->next = newmod;
36--
372.26.2
38
39