External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-24 22:55:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

conf: Parse and validate disk source seclabels together with the source

Browse Source 
Since seclabels are formatted along with the source element and will
also make sense to be passed for the backing chain we should parse them
in the place where we parse the disk source. Same applies for
validation.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
This commit is contained in:
Peter Krempa 2018-03-08 17:32:15 +01:00
parent 3960aeb7a6
commit b17573fe09
1 changed files with 15 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/conf/domain_conf.c
View File

@ -8631,6 +8631,10 @@ virDomainDiskSourceParse(xmlNodePtr node,
!(src->encryption = virStorageEncryptionParseNode(tmp, ctxt))) !(src->encryption = virStorageEncryptionParseNode(tmp, ctxt)))
goto cleanup; goto cleanup;
if (virSecurityDeviceLabelDefParseXML(&src->seclabels, &src->nseclabels,
ctxt, flags) < 0)
goto cleanup;
if (virDomainDiskSourcePrivateDataParse(ctxt, src, flags, xmlopt) < 0) if (virDomainDiskSourcePrivateDataParse(ctxt, src, flags, xmlopt) < 0)
goto cleanup; goto cleanup;
@ -8985,7 +8989,10 @@ virDomainDiskSourceDefParseAuthValidate(const virStorageSource *src)
static int static int
virDomainDiskDefParseValidate(const virDomainDiskDef *def) virDomainDiskDefParseValidate(const virDomainDiskDef *def,
virSecurityLabelDefPtr *vmSeclabels,
size_t nvmSeclabels)
{ {
virStorageSourcePtr next; virStorageSourcePtr next;
@ -9075,6 +9082,12 @@ virDomainDiskDefParseValidate(const virDomainDiskDef *def)
return -1; return -1;
} }
} }
if (virSecurityDeviceLabelDefValidateXML(next->seclabels,
next->nseclabels,
vmSeclabels,
nvmSeclabels) < 0)
return -1;
} }
return 0; return 0;
@ -9222,7 +9235,6 @@ virDomainDiskDefParseXML(virDomainXMLOptionPtr xmlopt,
unsigned int flags) unsigned int flags)
{ {
virDomainDiskDefPtr def; virDomainDiskDefPtr def;
xmlNodePtr sourceNode = NULL;
xmlNodePtr cur; xmlNodePtr cur;
xmlNodePtr save_ctxt = ctxt->node; xmlNodePtr save_ctxt = ctxt->node;
char *tmp = NULL; char *tmp = NULL;
@ -9281,8 +9293,6 @@ virDomainDiskDefParseXML(virDomainXMLOptionPtr xmlopt,
continue; continue;
if (!source && virXMLNodeNameEqual(cur, "source")) { if (!source && virXMLNodeNameEqual(cur, "source")) {
sourceNode = cur;
if (virDomainDiskSourceParse(cur, ctxt, def->src, flags, xmlopt) < 0) if (virDomainDiskSourceParse(cur, ctxt, def->src, flags, xmlopt) < 0)
goto error; goto error;
@ -9460,25 +9470,6 @@ virDomainDiskDefParseXML(virDomainXMLOptionPtr xmlopt,
goto error; goto error;
} }
/* If source is present, check for an optional seclabel override. */
if (sourceNode) {
xmlNodePtr saved_node = ctxt->node;
ctxt->node = sourceNode;
if (virSecurityDeviceLabelDefParseXML(&def->src->seclabels,
&def->src->nseclabels,
ctxt,
flags) < 0)
goto error;
if (virSecurityDeviceLabelDefValidateXML(def->src->seclabels,
def->src->nseclabels,
vmSeclabels,
nvmSeclabels) < 0)
goto error;
ctxt->node = saved_node;
}
if (!target && !(flags & VIR_DOMAIN_DEF_PARSE_DISK_SOURCE)) { if (!target && !(flags & VIR_DOMAIN_DEF_PARSE_DISK_SOURCE)) {
if (def->src->srcpool) { if (def->src->srcpool) {
if (virAsprintf(&tmp, "pool = '%s', volume = '%s'", if (virAsprintf(&tmp, "pool = '%s', volume = '%s'",
@ -9644,7 +9635,7 @@ virDomainDiskDefParseXML(virDomainXMLOptionPtr xmlopt,
goto error; goto error;
} }
if (virDomainDiskDefParseValidate(def) < 0) if (virDomainDiskDefParseValidate(def, vmSeclabels, nvmSeclabels) < 0)
goto error; goto error;
cleanup: cleanup: