Re: [libvirt] [PATCH 6/7] domain: Always validate seclabel model

This will help facilitate disabling seclabel for an individual VM. One functional change is that the user can now hardcode type='dynamic', but there was no good reason to deny it anyways. Signed-off-by: Cole Robinson <crobinso(a)redhat.com&gt; --- src/conf/domain_conf.c | 34 ++++++++++---------- src/security/security_apparmor.c | 6 ++-- src/security/security_selinux.c | 6 ++-- .../qemuxml2xml-seclabel-dynamic-out.xml | 1 + 4 files changed, 24 insertions(+), 23 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 077a396..e5b89a2 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -4238,28 +4238,28 @@ virSecurityLabelDefParseXML(const virDomainDefPtr def, goto error; } + p = virXPathStringLimit("string(./seclabel/@model)", + VIR_SECURITY_MODEL_BUFLEN-1, ctxt); + if (p == NULL) { + virDomainReportError(VIR_ERR_XML_ERROR, + "%s", _("missing security model")); + goto error; + } + + def->seclabel.model = virDomainSeclabelModelTypeFromString(p); + if (def->seclabel.model < 0) { + virDomainReportError(VIR_ERR_XML_ERROR, + _("unknown security model '%s'"), p); + VIR_FREE(p); + goto error; + } + VIR_FREE(p); + /* Only parse details, if using static labels, or * if the 'live' VM XML is requested */ if (def->seclabel.type == VIR_DOMAIN_SECLABEL_STATIC || !(flags & VIR_DOMAIN_XML_INACTIVE)) { - p = virXPathStringLimit("string(./seclabel/@model)", - VIR_SECURITY_MODEL_BUFLEN-1, ctxt); - if (p == NULL) { - virDomainReportError(VIR_ERR_XML_ERROR, - "%s", _("missing security model")); - goto error; - } - - def->seclabel.model = virDomainSeclabelModelTypeFromString(p); - if (def->seclabel.model < 0) { - virDomainReportError(VIR_ERR_XML_ERROR, - _("unknown security model '%s'"), p); - VIR_FREE(p); - goto error; - } - VIR_FREE(p); - p = virXPathStringLimit("string(./seclabel/label[1])", VIR_SECURITY_LABEL_BUFLEN-1, ctxt); if (p == NULL) {