]> git.ipfire.org Git - thirdparty/qemu.git/commit
vnc: tight: Fix crash after 2GB of output
authorMichael Tokarev <mjt@tls.msk.ru>
Mon, 21 Mar 2011 08:34:35 +0000 (09:34 +0100)
committerAurelien Jarno <aurelien@aurel32.net>
Sat, 9 Apr 2011 22:23:52 +0000 (00:23 +0200)
commitf8a4bf59fe40c0a01368673f7e5d530714f1aacc
treef923d93910122db470f3f953bcdadc86c07b3479
parentb3d657bce4a99f7494a1b52ed14bd22b6a288e46
vnc: tight: Fix crash after 2GB of output

fix 2Gb integer overflow in in VNC tight and zlib encodings

As found by Roland Dreier <roland@purestorage.com> (excellent
catch!), when amount of VNC compressed data produced by zlib
and sent to client exceeds 2Gb, integer overflow occurs because
currently, we calculate amount of data produced at each step by
comparing saved total_out with new total_out, and total_out is
something which grows without bounds.  Compare it with previous
avail_out instead of total_out, and leave total_out alone.

The same code is used in vnc-enc-tight.c and vnc-enc-zlib.c,
so fix both cases.

There, there's no actual need to save previous_out value, since
capacity-offset (which is how that value is calculated) stays
the same so it can be recalculated again after call to deflate(),
but whole thing becomes less readable this way.

Reported-by: Roland Dreier <roland@purestorage.com>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
Signed-off-by: Corentin Chary <corentin.chary@gmail.com>
Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
ui/vnc-enc-tight.c
ui/vnc-enc-zlib.c