From: Daniel Axtens <dja@axtens.net>
Date: Thu, 21 Jan 2021 07:54:29 +0000 (+1100)
Subject: disk/lvm: Bail on missing PV list
X-Git-Tag: grub-2.06-rc1~55
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2958695c4cdc785de6ed708709af071a2d20afef;p=thirdparty%2Fgrub.git

disk/lvm: Bail on missing PV list

There's an if block for the presence of "physical_volumes {", but if
that block is absent, then p remains NULL and a NULL-deref will result
when looking for logical volumes.

It doesn't seem like LVM makes sense without physical volumes, so error
out rather than crashing.

Signed-off-by: Daniel Axtens <dja@axtens.net>
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
---

diff --git a/grub-core/disk/lvm.c b/grub-core/disk/lvm.c
index b70d7d79f..31bbc9acc 100644
--- a/grub-core/disk/lvm.c
+++ b/grub-core/disk/lvm.c
@@ -409,6 +409,8 @@ grub_lvm_detect (grub_disk_t disk,
 	      goto fail4;
 	    }
 	}
+      else
+        goto fail4;
 
       p = grub_strstr (p, "logical_volumes {");
       if (p)