openkylin
/
libvirt
mirror of https://gitee.com/openkylin/libvirt.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

virDomainControllerDefParseXML: Return early if there's unexpectedly many elements 

Move some checks earlier so that they are not tucked at the back of the
block of code doing the actual parsing.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Peter Krempa 2022-08-26 13:56:48 +02:00
parent e55888d075
commit b61854baf2
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/conf/domain_conf.c
View File

@ -8181,7 +8181,12 @@ virDomainControllerDefParseXML(virDomainXMLOption *xmlopt,
return NULL; return NULL;
} }
nmodelNodes = virXPathNodeSet("./model", ctxt, &modelNodes); if ((nmodelNodes = virXPathNodeSet("./model", ctxt, &modelNodes)) > 1) {
virReportError(VIR_ERR_XML_ERROR, "%s",
_("Multiple <model> elements in controller definition not allowed"));
return NULL;
}
if (nmodelNodes == 1) { if (nmodelNodes == 1) {
if (def->type == VIR_DOMAIN_CONTROLLER_TYPE_PCI) { if (def->type == VIR_DOMAIN_CONTROLLER_TYPE_PCI) {
if (virXMLPropEnum(modelNodes[0], "name", if (virXMLPropEnum(modelNodes[0], "name",
@ -8190,14 +8195,14 @@ virDomainControllerDefParseXML(virDomainXMLOption *xmlopt,
&def->opts.pciopts.modelName) < 0) &def->opts.pciopts.modelName) < 0)
return NULL; return NULL;
} }
} else if (nmodelNodes > 1) { }
if ((ntargetNodes = virXPathNodeSet("./target", ctxt, &targetNodes)) > 1) {
virReportError(VIR_ERR_XML_ERROR, "%s", virReportError(VIR_ERR_XML_ERROR, "%s",
_("Multiple <model> elements in " _("Multiple <target> elements in controller definition not allowed"));
"controller definition not allowed"));
return NULL; return NULL;
} }
ntargetNodes = virXPathNodeSet("./target", ctxt, &targetNodes);
if (ntargetNodes == 1) { if (ntargetNodes == 1) {
if (def->type == VIR_DOMAIN_CONTROLLER_TYPE_PCI) { if (def->type == VIR_DOMAIN_CONTROLLER_TYPE_PCI) {
if (virXMLPropInt(targetNodes[0], "chassisNr", 0, VIR_XML_PROP_NONE, if (virXMLPropInt(targetNodes[0], "chassisNr", 0, VIR_XML_PROP_NONE,
@ -8230,11 +8235,6 @@ virDomainControllerDefParseXML(virDomainXMLOption *xmlopt,
def->opts.pciopts.targetIndex) < 0) def->opts.pciopts.targetIndex) < 0)
return NULL; return NULL;
} }
} else if (ntargetNodes > 1) {
virReportError(VIR_ERR_XML_ERROR, "%s",
_("Multiple <target> elements in "
"controller definition not allowed"));
return NULL;
} }
/* node is parsed differently from target attributes because /* node is parsed differently from target attributes because