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