From: Peter Maydell <peter.maydell@linaro.org>
Date: Thu, 30 Oct 2014 18:21:25 +0000 (+0000)
Subject: Merge remote-tracking branch 'remotes/kraxel/tags/pull-vnc-20141028-1' into staging
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=fecd54ccd79c647d7161878c92eba9bf37a4279d;p=qemu.git

Merge remote-tracking branch 'remotes/kraxel/tags/pull-vnc-20141028-1' into staging

vnc: return directly if no vnc client connected
vnc: sanitize bits_per_pixel from the client (CVE-2014-7815)

# gpg: Signature made Tue 28 Oct 2014 10:52:31 GMT using RSA key ID D3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>"
# gpg:                 aka "Gerd Hoffmann <gerd@kraxel.org>"
# gpg:                 aka "Gerd Hoffmann (private) <kraxel@gmail.com>"

* remotes/kraxel/tags/pull-vnc-20141028-1:
  vnc: return directly if no vnc client connected
  vnc: sanitize bits_per_pixel from the client

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---

fecd54ccd79c647d7161878c92eba9bf37a4279d