]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
conf: Don't call 'virDomainDiskDefAssignAddress' when disk->dst is NULL
authorPeter Krempa <pkrempa@redhat.com>
Tue, 7 Sep 2021 07:22:42 +0000 (09:22 +0200)
committerPeter Krempa <pkrempa@redhat.com>
Thu, 9 Sep 2021 08:17:28 +0000 (10:17 +0200)
The code rejecting a XML when the disk target is missing was moved to
the validation code which goes after post parse. One of the cases in the
disk post parse code didn't check whether 'disk->dst' is set which at
that point isn't guaranteed.

Fixes: 61fd7174c2afbe128ef1896198919429bcaca3d7
Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=2001627
Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
src/conf/domain_conf.c

index dbefc98ee80a55b7e350de2de27a74afbcadef6f..cb9e7218ffc590a8b643b595f0bde6590c96f3af 100644 (file)
@@ -5413,6 +5413,7 @@ virDomainDiskDefPostParse(virDomainDiskDef *disk,
     }
 
     if (disk->info.type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE &&
+        disk->dst &&
         virDomainDiskDefAssignAddress(xmlopt, disk, def) < 0) {
         return -1;
     }