diff options
author | Peter Maydell <peter.maydell@linaro.org> | 2014-10-30 18:21:25 +0000 |
---|---|---|
committer | Peter Maydell <peter.maydell@linaro.org> | 2014-10-30 18:21:25 +0000 |
commit | fecd54ccd79c647d7161878c92eba9bf37a4279d (patch) | |
tree | 635a63410b4a77a0e2f79afbcb987ea982ce49d3 /rules.mak | |
parent | f33f43bd86beb94ae1be14a62dc89cbeb4a665bb (diff) | |
parent | 9d6b20704734fe1ab789400806ebd54f579d50a2 (diff) |
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>
Diffstat (limited to 'rules.mak')
0 files changed, 0 insertions, 0 deletions