summary refs log tree commit diff stats
path: root/ui
diff options
context:
space:
mode:
authorWolfgang Bumiller <w.bumiller@proxmox.com>2016-01-12 13:52:39 +0100
committerGerd Hoffmann <kraxel@redhat.com>2016-01-18 16:36:21 +0100
commit67c4c2bd958b0074ffbcde12cb434cd064adab12 (patch)
treeb57a08ad7cb13184413fa35aab7946d7f38dc5d8 /ui
parentfba958c692e47a373d15c1fd3d72b255bf76adbd (diff)
downloadfocaccia-qemu-67c4c2bd958b0074ffbcde12cb434cd064adab12.tar.gz
focaccia-qemu-67c4c2bd958b0074ffbcde12cb434cd064adab12.zip
vnc: clear vs->tlscreds after unparenting it
This pointer should be cleared in vnc_display_close()
otherwise a use-after-free can happen when when using the
old style 'x509' and 'tls' options rather than a persistent
tls-creds -object, by issuing monitor commands to change
the vnc server like so:

Start with: -vnc unix:test.socket,x509,tls
Then use the following monitor command:
  change vnc unix:test.socket

After this the pointer is still set but invalid and a crash
can be triggered for instance by issuing the same command a
second time which will try to object_unparent() the same
pointer again.

Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
Reviewed-by: Daniel P. Berrange <berrange@redhat.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Diffstat (limited to 'ui')
-rw-r--r--ui/vnc.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/ui/vnc.c b/ui/vnc.c
index 54673eb8c7..c2d3773968 100644
--- a/ui/vnc.c
+++ b/ui/vnc.c
@@ -3134,6 +3134,7 @@ static void vnc_display_close(VncDisplay *vs)
     vs->subauth = VNC_AUTH_INVALID;
     if (vs->tlscreds) {
         object_unparent(OBJECT(vs->tlscreds));
+        vs->tlscreds = NULL;
     }
     g_free(vs->tlsaclname);
     vs->tlsaclname = NULL;