External/libvirt
1
0
Fork 0
Code

qemu: vnc: error out for invalid port number

Browse Source 
In the XML we have the vnc port number, but QEMU takes on command line
a vnc screen number, it's port-5900.  We should fail with error message
that only ports in range [5900,65535] are valid.

Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1164966

Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
This commit is contained in:
Pavel Hrdina 2015-05-12 18:18:14 +02:00
parent abac12b585
commit afaffeb873
1 changed files with 50 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

90
src/qemu/qemu_command.c
View File

@ -7591,50 +7591,60 @@ qemuBuildGraphicsVNCCommandLine(virQEMUDriverConfigPtr cfg,
virBufferAsprintf(&opt, "unix:%s", graphics->data.vnc.socket); virBufferAsprintf(&opt, "unix:%s", graphics->data.vnc.socket);
} else if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_VNC_COLON)) { } else {
switch (virDomainGraphicsListenGetType(graphics, 0)) { if (!graphics->data.vnc.autoport &&
case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_ADDRESS: (graphics->data.vnc.port < 5900 ||
listenAddr = virDomainGraphicsListenGetAddress(graphics, 0); graphics->data.vnc.port > 65535)) {
break; virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("vnc port must be in range [5900,65535]"));
case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_NETWORK: goto error;
listenNetwork = virDomainGraphicsListenGetNetwork(graphics, 0);
if (!listenNetwork)
break;
ret = networkGetNetworkAddress(listenNetwork, &netAddr);
if (ret <= -2) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
"%s", _("network-based listen not possible, "
"network driver not present"));
goto error;
}
if (ret < 0)
goto error;
listenAddr = netAddr;
/* store the address we found in the <graphics> element so it will
* show up in status. */
if (virDomainGraphicsListenSetAddress(graphics, 0,
listenAddr, -1, false) < 0)
goto error;
break;
} }
if (!listenAddr) if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_VNC_COLON)) {
listenAddr = cfg->vncListen; switch (virDomainGraphicsListenGetType(graphics, 0)) {
case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_ADDRESS:
listenAddr = virDomainGraphicsListenGetAddress(graphics, 0);
break;
escapeAddr = strchr(listenAddr, ':') != NULL; case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_NETWORK:
if (escapeAddr) listenNetwork = virDomainGraphicsListenGetNetwork(graphics, 0);
virBufferAsprintf(&opt, "[%s]", listenAddr); if (!listenNetwork)
else break;
virBufferAdd(&opt, listenAddr, -1); ret = networkGetNetworkAddress(listenNetwork, &netAddr);
virBufferAsprintf(&opt, ":%d", if (ret <= -2) {
graphics->data.vnc.port - 5900); virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
"%s", _("network-based listen not possible, "
"network driver not present"));
goto error;
}
if (ret < 0)
goto error;
VIR_FREE(netAddr); listenAddr = netAddr;
} else { /* store the address we found in the <graphics> element so it
virBufferAsprintf(&opt, "%d", * will show up in status. */
graphics->data.vnc.port - 5900); if (virDomainGraphicsListenSetAddress(graphics, 0,
listenAddr, -1, false) < 0)
goto error;
break;
}
if (!listenAddr)
listenAddr = cfg->vncListen;
escapeAddr = strchr(listenAddr, ':') != NULL;
if (escapeAddr)
virBufferAsprintf(&opt, "[%s]", listenAddr);
else
virBufferAdd(&opt, listenAddr, -1);
virBufferAsprintf(&opt, ":%d",
graphics->data.vnc.port - 5900);
VIR_FREE(netAddr);
} else {
virBufferAsprintf(&opt, "%d",
graphics->data.vnc.port - 5900);
}
} }
if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_VNC_COLON)) { if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_VNC_COLON)) {