From 7eb0ee175b278a4439cee65a7a554767f0be9cd1 Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=A1n=20Tomko?= Date: Thu, 12 Jun 2014 10:50:43 +0200 Subject: [PATCH] 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 https://bugzilla.redhat.com/show_bug.cgi?id=1108590 --- src/qemu/qemu_domain.c | 3 ++- src/qemu/qemu_driver.c | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) 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; -- 2.39.5