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

virDomainChrDefParseTargetXML: Use virXMLProp* 

This strictens the parser to disallow negative values (interpreted as
`UINT_MAX + value + 1`) for attribute `port`. Allowing negative
numbers to be interpreted this way makes no sense for this attribute.

Signed-off-by: Tim Wiederhake <twiederh@redhat.com>
Reviewed-by: Laine Stump <laine@redhat.com>
This commit is contained in:
Tim Wiederhake 2021-05-18 17:04:48 +02:00 committed by Laine Stump
parent 38d76cde5e
commit 7423635e46
1 changed files with 5 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/conf/domain_conf.c
View File

@ -10977,7 +10977,6 @@ virDomainChrDefParseTargetXML(virDomainChrDef *def,
g_autofree char *targetModel = NULL; g_autofree char *targetModel = NULL;
g_autofree char *addrStr = NULL; g_autofree char *addrStr = NULL;
g_autofree char *portStr = NULL; g_autofree char *portStr = NULL;
g_autofree char *stateStr = NULL;
VIR_XPATH_NODE_AUTORESTORE(ctxt) VIR_XPATH_NODE_AUTORESTORE(ctxt)
ctxt->node = cur; ctxt->node = cur;
@ -11007,7 +11006,6 @@ virDomainChrDefParseTargetXML(virDomainChrDef *def,
switch (def->targetType) { switch (def->targetType) {
case VIR_DOMAIN_CHR_CHANNEL_TARGET_TYPE_GUESTFWD: case VIR_DOMAIN_CHR_CHANNEL_TARGET_TYPE_GUESTFWD:
addrStr = virXMLPropString(cur, "address"); addrStr = virXMLPropString(cur, "address");
portStr = virXMLPropString(cur, "port");
def->target.addr = g_new0(virSocketAddr, 1); def->target.addr = g_new0(virSocketAddr, 1);
@ -11028,19 +11026,8 @@ virDomainChrDefParseTargetXML(virDomainChrDef *def,
return -1; return -1;
} }
if (portStr == NULL) { if (virXMLPropUInt(cur, "port", 10, VIR_XML_PROP_REQUIRED, &port) < 0)
virReportError(VIR_ERR_XML_ERROR, "%s",
_("guestfwd channel does "
"not define a target port"));
return -1; return -1;
}
if (virStrToLong_ui(portStr, NULL, 10, &port) < 0) {
virReportError(VIR_ERR_XML_ERROR,
_("Invalid port number: %s"),
portStr);
return -1;
}
virSocketAddrSetPort(def->target.addr, port); virSocketAddrSetPort(def->target.addr, port);
break; break;
@ -11050,18 +11037,12 @@ virDomainChrDefParseTargetXML(virDomainChrDef *def,
def->target.name = virXMLPropString(cur, "name"); def->target.name = virXMLPropString(cur, "name");
if (def->targetType == VIR_DOMAIN_CHR_CHANNEL_TARGET_TYPE_VIRTIO && if (def->targetType == VIR_DOMAIN_CHR_CHANNEL_TARGET_TYPE_VIRTIO &&
!(flags & VIR_DOMAIN_DEF_PARSE_INACTIVE) && !(flags & VIR_DOMAIN_DEF_PARSE_INACTIVE)) {
(stateStr = virXMLPropString(cur, "state"))) {
int tmp;
if ((tmp = virDomainChrDeviceStateTypeFromString(stateStr)) <= 0) { if (virXMLPropEnum(cur, "state",
virReportError(VIR_ERR_XML_ERROR, virDomainChrDeviceStateTypeFromString,
_("invalid channel state value '%s'"), VIR_XML_PROP_NONZERO, &def->state) < 0)
stateStr);
return -1; return -1;
}
def->state = tmp;
} }
break; break;
} }