From: Ján Tomko <jtomko@redhat.com>
Date: Thu, 12 Jun 2014 08:50:43 +0000 (+0200)
Subject: Fix crash when saving a domain with type none dac label
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=7eb0ee175b278a4439cee65a7a554767f0be9cd1;p=libvirt.git

Fix crash when saving a domain with type none dac label

qemuDomainGetImageIds did not check if there was a label
in the seclabel, thus crashing on
<seclabel type='none' model='dac'/>

https://bugzilla.redhat.com/show_bug.cgi?id=1108590
---

diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index 962698b0aa..e40c5ec18b 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -2409,7 +2409,8 @@ qemuDomainGetImageIds(virQEMUDriverConfigPtr cfg,
             *gid = cfg->group;
     }
 
-    if (vm && (vmlabel = virDomainDefGetSecurityLabelDef(vm->def, "dac")))
+    if (vm && (vmlabel = virDomainDefGetSecurityLabelDef(vm->def, "dac")) &&
+        vmlabel->label)
         virParseOwnershipIds(vmlabel->label, uid, gid);
 
     if ((disklabel = virDomainDiskDefGetSecurityLabelDef(disk, "dac")) &&
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index ec72d9dd3a..e147d282c5 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -2771,6 +2771,7 @@ qemuOpenFile(virQEMUDriverPtr driver,
     /* TODO: Take imagelabel into account? */
     if (vm &&
         (seclabel = virDomainDefGetSecurityLabelDef(vm->def, "dac")) != NULL &&
+        seclabel->label != NULL &&
         (virParseOwnershipIds(seclabel->label, &user, &group) < 0))
         goto cleanup;