diff options
author | Peter Maydell <peter.maydell@linaro.org> | 2015-04-01 17:18:51 +0100 |
---|---|---|
committer | Peter Maydell <peter.maydell@linaro.org> | 2015-04-01 17:18:51 +0100 |
commit | fde069f751a9aa7e597c9d297a9995eca418a403 (patch) | |
tree | 6c56b659ac57e398ef32f2a5f77dc9ba95a7d65f /ui/vnc.h | |
parent | b8a86c4ac4d04c106ba38fbd707041cba334a155 (diff) | |
parent | 2cdb5e142fb93e875fa53c52864ef5eb8d5d8b41 (diff) |
Merge remote-tracking branch 'remotes/kraxel/tags/pull-cve-2015-1779-20150401-2' into staging
vnc: fix websocket security issues (cve-2015-1779).
# gpg: Signature made Wed Apr 1 16:14:34 2015 BST 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-cve-2015-1779-20150401-2:
CVE-2015-1779: limit size of HTTP headers from websockets clients
CVE-2015-1779: incrementally decode websocket frames
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'ui/vnc.h')
-rw-r--r-- | ui/vnc.h | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -306,6 +306,8 @@ struct VncState #ifdef CONFIG_VNC_WS Buffer ws_input; Buffer ws_output; + size_t ws_payload_remain; + WsMask ws_payload_mask; #endif /* current output mode information */ VncWritePixels *write_pixels; |