From: Peter Krempa <pkrempa@redhat.com>
Date: Mon, 22 Mar 2021 13:43:17 +0000 (+0100)
Subject: qemuCheckpointDiscardBitmaps: Refuse to delete checkpoint with NULL bitmap name
X-Git-Tag: v7.2.0-rc1~25
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3a340872f8792f35094f0ae6df10163a9ba99f12;p=thirdparty%2Flibvirt.git

qemuCheckpointDiscardBitmaps: Refuse to delete checkpoint with NULL bitmap name

When a checkpoint is redefined without providing the domain XML, we
might end up with a definition where the per-disk bitmap name is not
set. Trying to delete such checkpoint would lead to a crash.

Refuse such deletion.

Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1941600
Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
---

diff --git a/src/qemu/qemu_checkpoint.c b/src/qemu/qemu_checkpoint.c
index 689a556959..d2a621a52b 100644
--- a/src/qemu/qemu_checkpoint.c
+++ b/src/qemu/qemu_checkpoint.c
@@ -206,6 +206,13 @@ qemuCheckpointDiscardBitmaps(virDomainObjPtr vm,
         if (chkdisk->type != VIR_DOMAIN_CHECKPOINT_TYPE_BITMAP)
             continue;
 
+        if (!chkdisk->bitmap) {
+            virReportError(VIR_ERR_INVALID_ARG,
+                           _("missing bitmap name for disk '%s' of checkpoint '%s'"),
+                           chkdisk->name, chkdef->parent.name);
+            return -1;
+        }
+
         if (qemuCheckpointDiscardDiskBitmaps(domdisk->src, blockNamedNodeData,
                                              chkdisk->bitmap,
                                              actions, domdisk->dst,