1From 156c281a1625dc73fd350530630c6f2d5673d4f6 Mon Sep 17 00:00:00 2001
2From: Darren Kenny <darren.kenny@oracle.com>
3Date: Tue, 8 Dec 2020 10:00:51 +0000
4Subject: [PATCH] disk/ldm: Fix memory leak on uninserted lv references
5
6The problem here is that the memory allocated to the variable lv is not
7yet inserted into the list that is being processed at the label fail2.
8
9As we can already see at line 342, which correctly frees lv before going
10to fail2, we should also be doing that at these earlier jumps to fail2.
11
12Fixes: CID 73824
13
14Signed-off-by: Darren Kenny <darren.kenny@oracle.com>
15Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
16Signed-off-by: Stefan Sørensen <stefan.sorensen@spectralink.com>
17---
18 grub-core/disk/ldm.c | 10 ++++++++--
19 1 file changed, 8 insertions(+), 2 deletions(-)
20
21diff --git a/grub-core/disk/ldm.c b/grub-core/disk/ldm.c
22index 54713f4..e82e989 100644
23--- a/grub-core/disk/ldm.c
24+++ b/grub-core/disk/ldm.c
25@@ -321,7 +321,10 @@ make_vg (grub_disk_t disk,
26 	  lv->visible = 1;
27 	  lv->segments = grub_zalloc (sizeof (*lv->segments));
28 	  if (!lv->segments)
29-	    goto fail2;
30+	    {
31+	      grub_free (lv);
32+	      goto fail2;
33+	    }
34 	  lv->segments->start_extent = 0;
35 	  lv->segments->type = GRUB_DISKFILTER_MIRROR;
36 	  lv->segments->node_count = 0;
37@@ -329,7 +332,10 @@ make_vg (grub_disk_t disk,
38 	  lv->segments->nodes = grub_calloc (lv->segments->node_alloc,
39 					     sizeof (*lv->segments->nodes));
40 	  if (!lv->segments->nodes)
41-	    goto fail2;
42+	    {
43+	      grub_free (lv);
44+	      goto fail2;
45+	    }
46 	  ptr = vblk[i].dynamic;
47 	  if (ptr + *ptr + 1 >= vblk[i].dynamic
48 	      + sizeof (vblk[i].dynamic))
49--
502.14.2
51
52