public/qemu
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

ui/vnc-clipboard: fix inflate_buffer

Browse source 
Commit d921fea338 ("ui/vnc-clipboard: fix infinite loop in
inflate_buffer (CVE-2023-3255)") removed this hunk, but it is still
required, because it can happen that stream.avail_in becomes zero
before coming across a return value of Z_STREAM_END in the loop.

This fixes the host->guest direction of the clipboard with noVNC and
TigerVNC as clients.

Fixes: d921fea338 ("ui/vnc-clipboard: fix infinite loop in inflate_buffer (CVE-2023-3255)")
Reported-by: Friedrich Weber <f.weber@proxmox.com>
Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
Acked-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <20231122125826.228189-1-f.ebner@proxmox.com>
(cherry picked from commit ebfbf394671163c14e2b24d98f3927a3151d1aff)
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
This commit is contained in:
Fiona Ebner 2023-11-22 13:58:26 +01:00 committed by Michael Tokarev
parent 5133410f8b
commit 4b2648356f
1 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ui/vnc-clipboard.c
View file

@ -69,6 +69,11 @@ static uint8_t *inflate_buffer(uint8_t *in, uint32_t in_len, uint32_t *size)
} }
} }
*size = stream.total_out;
inflateEnd(&stream);
return out;
err_end: err_end:
inflateEnd(&stream); inflateEnd(&stream);
err: err: