External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-22 13:45:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu: Let empty default VNC password work as documented

Browse Source 
CVE-2016-5008

Setting an empty graphics password is documented as a way to disable
VNC/SPICE access, but QEMU does not always behaves like that. VNC would
happily accept the empty password. Let's enforce the behavior by setting
password expiration to "now".

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

Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
(cherry picked from commit bb848feec0)
(cherry picked from commit d933f68ee6)
This commit is contained in:
Jiri Denemark 2016-06-28 14:39:58 +02:00 committed by Daniel P. Berrange
parent 3b7ce055e3
commit a3954cc793
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/qemu/qemu_hotplug.c
View File

@ -2748,6 +2748,7 @@ qemuDomainChangeGraphicsPasswords(virQEMUDriverPtr driver,
time_t now = time(NULL); time_t now = time(NULL);
char expire_time [64]; char expire_time [64];
const char *connected = NULL; const char *connected = NULL;
const char *password;
int ret = -1; int ret = -1;
virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver); virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver);
@ -2755,15 +2756,13 @@ qemuDomainChangeGraphicsPasswords(virQEMUDriverPtr driver,
ret = 0; ret = 0;
goto cleanup; goto cleanup;
} }
password = auth->passwd ? auth->passwd : defaultPasswd;
if (auth->connected) if (auth->connected)
connected = virDomainGraphicsAuthConnectedTypeToString(auth->connected); connected = virDomainGraphicsAuthConnectedTypeToString(auth->connected);
qemuDomainObjEnterMonitor(driver, vm); qemuDomainObjEnterMonitor(driver, vm);
ret = qemuMonitorSetPassword(priv->mon, ret = qemuMonitorSetPassword(priv->mon, type, password, connected);
type,
auth->passwd ? auth->passwd : defaultPasswd,
connected);
if (ret == -2) { if (ret == -2) {
if (type != VIR_DOMAIN_GRAPHICS_TYPE_VNC) { if (type != VIR_DOMAIN_GRAPHICS_TYPE_VNC) {
@ -2771,14 +2770,15 @@ qemuDomainChangeGraphicsPasswords(virQEMUDriverPtr driver,
_("Graphics password only supported for VNC")); _("Graphics password only supported for VNC"));
ret = -1; ret = -1;
} else { } else {
ret = qemuMonitorSetVNCPassword(priv->mon, ret = qemuMonitorSetVNCPassword(priv->mon, password);
auth->passwd ? auth->passwd : defaultPasswd);
} }
} }
if (ret != 0) if (ret != 0)
goto end_job; goto end_job;
if (auth->expires) { if (password[0] == '\0') {
snprintf(expire_time, sizeof(expire_time), "now");
} else if (auth->expires) {
time_t lifetime = auth->validTo - now; time_t lifetime = auth->validTo - now;
if (lifetime <= 0) if (lifetime <= 0)
snprintf(expire_time, sizeof(expire_time), "now"); snprintf(expire_time, sizeof(expire_time), "now");