[Qemu-commits] [qemu/qemu] 5a693e: vnc: fix incorrect checking condition when updatin...

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 5a693efda84d7df5136cc2bd31c959bb1530b0c9
      
https://github.com/qemu/qemu/commit/5a693efda84d7df5136cc2bd31c959bb1530b0c9
  Author: Gonglei <address@hidden>
  Date:   2016-07-12 (Tue, 12 Jul 2016)

  Changed paths:
    M ui/vnc.c

  Log Message:
  -----------
  vnc: fix incorrect checking condition when updating client

vs->disconnecting is set to TRUE and vs->ioc is closed, but
vs->ioc isn't set to NULL, so that the vnc_disconnect_finish()
isn't invoked when you update client in vnc_update_client()
after vnc_disconnect_start invoked. Let's using change the checking
condition to avoid resource leak.

Signed-off-by: Haibin Wang <address@hidden>
Signed-off-by: Gonglei <address@hidden>
Reviewed-by: Daniel P. Berrange <address@hidden>
Message-id: address@hidden
Signed-off-by: Gerd Hoffmann <address@hidden>


  Commit: 095497ffc66b7f031ff2a17f1e50f5cb105ce588
      
https://github.com/qemu/qemu/commit/095497ffc66b7f031ff2a17f1e50f5cb105ce588
  Author: Peter Lieven <address@hidden>
  Date:   2016-07-12 (Tue, 12 Jul 2016)

  Changed paths:
    M ui/vnc-enc-tight.c

  Log Message:
  -----------
  vnc-enc-tight: use thread local storage for palette

currently the color counting palette is allocated from heap, used and destroyed
for each single subrect. Use a static palette per thread for this purpose and
avoid the malloc and free for each update.

Signed-off-by: Peter Lieven <address@hidden>
Reviewed-by: Paolo Bonzini <address@hidden>
Message-id: address@hidden
Signed-off-by: Gerd Hoffmann <address@hidden>


  Commit: ea697449884d83b83fefbc9cd87bdde0c94b49d6
      
https://github.com/qemu/qemu/commit/ea697449884d83b83fefbc9cd87bdde0c94b49d6
  Author: Daniel P. Berrange <address@hidden>
  Date:   2016-07-12 (Tue, 12 Jul 2016)

  Changed paths:
    M ui/vnc.c

  Log Message:
  -----------
  ui: avoid crash if vnc client disconnects with writes pending

The vnc_client_read() function is called from the vnc_client_io()
event handler callback when there is incoming data to process.
If it detects that the client has disconnected, then it will
trigger cleanup and free'ing of the VncState client struct at
a safe time.

Unfortunately, the vnc_client_io() event handler will also call
vnc_client_write() to handle any outgoing data writes. So if
vnc_client_io() was invoked with both G_IO_IN and G_IO_OUT
events set, and the client disconnects, we may try to write to
a client which has just been freed.

https://bugs.launchpad.net/qemu/+bug/1594861

Signed-off-by: Daniel P. Berrange <address@hidden>
Message-id: address@hidden
Signed-off-by: Gerd Hoffmann <address@hidden>


  Commit: 910789c220818f276fe431cdfd79f02fadc0c259
      
https://github.com/qemu/qemu/commit/910789c220818f276fe431cdfd79f02fadc0c259
  Author: Peter Maydell <address@hidden>
  Date:   2016-07-12 (Tue, 12 Jul 2016)

  Changed paths:
    M ui/vnc-enc-tight.c
    M ui/vnc.c

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/kraxel/tags/pull-vnc-20160712-1' into 
staging

vnc: misc bugfixes.

# gpg: Signature made Tue 12 Jul 2016 08:22:40 BST
# gpg:                using RSA key 0x4CB6D8EED3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <address@hidden>"
# gpg:                 aka "Gerd Hoffmann <address@hidden>"
# gpg:                 aka "Gerd Hoffmann (private) <address@hidden>"
# Primary key fingerprint: A032 8CFF B93A 17A7 9901  FE7D 4CB6 D8EE D3E8 7138

* remotes/kraxel/tags/pull-vnc-20160712-1:
  ui: avoid crash if vnc client disconnects with writes pending
  vnc-enc-tight: use thread local storage for palette
  vnc: fix incorrect checking condition when updating client

Signed-off-by: Peter Maydell <address@hidden>


Compare: https://github.com/qemu/qemu/compare/f1ef55786691...910789c22081