NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

conf: domain: Convert all string length checks to STRLIM

Browse Source 
Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Peter Krempa 2021-11-25 13:38:19 +01:00
parent 55d951ef58
commit 70b0c2c183
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/conf/domain_conf.c
View File

@ -7791,7 +7791,7 @@ virSecurityLabelDefParseXML(xmlXPathContextPtr ctxt,
g_autoptr(virSecurityLabelDef) seclabel = NULL; g_autoptr(virSecurityLabelDef) seclabel = NULL;
if ((model = virXMLPropString(ctxt->node, "model")) && if ((model = virXMLPropString(ctxt->node, "model")) &&
strlen(model) >= VIR_SECURITY_MODEL_BUFLEN - 1) !STRLIM(model, VIR_SECURITY_MODEL_BUFLEN - 1))
g_clear_pointer(&model, g_free); g_clear_pointer(&model, g_free);
if (!(seclabel = virSecurityLabelDefNew(model))) if (!(seclabel = virSecurityLabelDefNew(model)))
@ -7856,8 +7856,7 @@ virSecurityLabelDefParseXML(xmlXPathContextPtr ctxt,
(!(flags & VIR_DOMAIN_DEF_PARSE_INACTIVE) && (!(flags & VIR_DOMAIN_DEF_PARSE_INACTIVE) &&
seclabel->type != VIR_DOMAIN_SECLABEL_NONE)) { seclabel->type != VIR_DOMAIN_SECLABEL_NONE)) {
seclabel->label = virXPathString("string(./label[1])", ctxt); seclabel->label = virXPathString("string(./label[1])", ctxt);
if (!seclabel->label || if (!seclabel->label || !STRLIM(seclabel->label, VIR_SECURITY_LABEL_BUFLEN - 1)) {
strlen(seclabel->label) >= VIR_SECURITY_LABEL_BUFLEN - 1) {
virReportError(VIR_ERR_XML_ERROR, virReportError(VIR_ERR_XML_ERROR,
"%s", _("security label is missing")); "%s", _("security label is missing"));
return NULL; return NULL;
@ -7870,8 +7869,7 @@ virSecurityLabelDefParseXML(xmlXPathContextPtr ctxt,
seclabel->type != VIR_DOMAIN_SECLABEL_NONE)) { seclabel->type != VIR_DOMAIN_SECLABEL_NONE)) {
seclabel->imagelabel = virXPathString("string(./imagelabel[1])", ctxt); seclabel->imagelabel = virXPathString("string(./imagelabel[1])", ctxt);
if (!seclabel->imagelabel || if (!seclabel->imagelabel || !STRLIM(seclabel->imagelabel, VIR_SECURITY_LABEL_BUFLEN - 1)) {
strlen(seclabel->imagelabel) >= VIR_SECURITY_LABEL_BUFLEN - 1) {
virReportError(VIR_ERR_XML_ERROR, virReportError(VIR_ERR_XML_ERROR,
"%s", _("security imagelabel is missing")); "%s", _("security imagelabel is missing"));
return NULL; return NULL;
@ -7883,7 +7881,7 @@ virSecurityLabelDefParseXML(xmlXPathContextPtr ctxt,
seclabel->baselabel = virXPathString("string(./baselabel[1])", ctxt); seclabel->baselabel = virXPathString("string(./baselabel[1])", ctxt);
if (seclabel->baselabel && if (seclabel->baselabel &&
strlen(seclabel->baselabel) >= VIR_SECURITY_LABEL_BUFLEN - 1) !STRLIM(seclabel->baselabel, VIR_SECURITY_LABEL_BUFLEN - 1))
g_clear_pointer(&seclabel->baselabel, g_free); g_clear_pointer(&seclabel->baselabel, g_free);
} }
@ -8047,7 +8045,7 @@ virSecurityDeviceLabelDefParseXML(virSecurityDeviceLabelDef ***seclabels_rtn,
ctxt->node = list[i]; ctxt->node = list[i];
label = virXPathString("string(./label)", ctxt); label = virXPathString("string(./label)", ctxt);
if (label && strlen(label) < VIR_SECURITY_LABEL_BUFLEN) if (label && STRLIM(label, VIR_SECURITY_LABEL_BUFLEN - 1))
seclabels[i]->label = g_steal_pointer(&label); seclabels[i]->label = g_steal_pointer(&label);
if (seclabels[i]->label && !seclabels[i]->relabel) { if (seclabels[i]->label && !seclabels[i]->relabel) {
@ -17508,7 +17506,7 @@ virDomainFeaturesHyperVDefParse(virDomainDef *def,
return -1; return -1;
} }
if (strlen(def->hyperv_vendor_id) > VIR_DOMAIN_HYPERV_VENDOR_ID_MAX) { if (!STRLIM(def->hyperv_vendor_id, VIR_DOMAIN_HYPERV_VENDOR_ID_MAX)) {
virReportError(VIR_ERR_XML_ERROR, virReportError(VIR_ERR_XML_ERROR,
_("HyperV vendor_id value must not be more than %d characters."), _("HyperV vendor_id value must not be more than %d characters."),
VIR_DOMAIN_HYPERV_VENDOR_ID_MAX); VIR_DOMAIN_HYPERV_VENDOR_ID_MAX);