|
 |
9b8edd |
From d9a832a2edbf95d664b07791f77a22ac3dfb95f5 Mon Sep 17 00:00:00 2001
|
|
|
9b8edd |
From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
|
|
|
9b8edd |
Date: Thu, 10 Jan 2019 12:11:04 +0100
|
|
|
9b8edd |
Subject: [PATCH] Fix CVE-2018-15127 (Heap out-of-bounds write in
|
|
|
9b8edd |
rfbserver.c:rfbProcessFileTransferReadBuffer())
|
|
|
9b8edd |
MIME-Version: 1.0
|
|
|
9b8edd |
Content-Type: text/plain; charset=UTF-8
|
|
|
9b8edd |
Content-Transfer-Encoding: 8bit
|
|
|
9b8edd |
|
|
|
9b8edd |
This patch contains the following three upstream patches squashed
|
|
|
9b8edd |
together and ported to 0.9.11 version:
|
|
|
9b8edd |
|
|
|
9b8edd |
commit 502821828ed00b4a2c4bef90683d0fd88ce495de
|
|
|
9b8edd |
Author: Christian Beier <dontmind@freeshell.org>
|
|
|
9b8edd |
Date: Sun Oct 21 20:21:30 2018 +0200
|
|
|
9b8edd |
|
|
|
9b8edd |
LibVNCServer: fix heap out-of-bound write access
|
|
|
9b8edd |
|
|
|
9b8edd |
Closes #243
|
|
|
9b8edd |
|
|
|
9b8edd |
commit 15bb719c03cc70f14c36a843dcb16ed69b405707
|
|
|
9b8edd |
Author: Christian Beier <dontmind@freeshell.org>
|
|
|
9b8edd |
Date: Sun Jan 6 15:13:56 2019 +0100
|
|
|
9b8edd |
|
|
|
9b8edd |
Error out in rfbProcessFileTransferReadBuffer if length can not be allocated
|
|
|
9b8edd |
|
|
|
9b8edd |
re #273
|
|
|
9b8edd |
|
|
|
9b8edd |
commit 09e8fc02f59f16e2583b34fe1a270c238bd9ffec
|
|
|
9b8edd |
Author: Petr Písař <ppisar@redhat.com>
|
|
|
9b8edd |
Date: Mon Jan 7 10:40:01 2019 +0100
|
|
|
9b8edd |
|
|
|
9b8edd |
Limit lenght to INT_MAX bytes in rfbProcessFileTransferReadBuffer()
|
|
|
9b8edd |
|
|
|
9b8edd |
This ammends 15bb719c03cc70f14c36a843dcb16ed69b405707 fix for a heap
|
|
|
9b8edd |
out-of-bound write access in rfbProcessFileTransferReadBuffer() when
|
|
|
9b8edd |
reading a transfered file content in a server. The former fix did not
|
|
|
9b8edd |
work on platforms with a 32-bit int type (expected by rfbReadExact()).
|
|
|
9b8edd |
|
|
|
9b8edd |
CVE-2018-15127
|
|
|
9b8edd |
<https://github.com/LibVNC/libvncserver/issues/243>
|
|
|
9b8edd |
<https://github.com/LibVNC/libvncserver/issues/273>
|
|
|
9b8edd |
|
|
|
9b8edd |
Signed-off-by: Petr Písař <ppisar@redhat.com>
|
|
|
9b8edd |
---
|
|
|
9b8edd |
libvncserver/rfbserver.c | 17 +++++++++++++++--
|
|
|
9b8edd |
1 file changed, 15 insertions(+), 2 deletions(-)
|
|
|
9b8edd |
|
|
|
9b8edd |
diff --git a/libvncserver/rfbserver.c b/libvncserver/rfbserver.c
|
|
|
9b8edd |
index b50a7f4..1b4dd97 100644
|
|
|
9b8edd |
--- a/libvncserver/rfbserver.c
|
|
|
9b8edd |
+++ b/libvncserver/rfbserver.c
|
|
|
9b8edd |
@@ -1471,11 +1471,24 @@ char *rfbProcessFileTransferReadBuffer(rfbClientPtr cl, uint32_t length)
|
|
|
9b8edd |
int n=0;
|
|
|
9b8edd |
|
|
|
9b8edd |
FILEXFER_ALLOWED_OR_CLOSE_AND_RETURN("", cl, NULL);
|
|
|
9b8edd |
+
|
|
|
9b8edd |
/*
|
|
|
9b8edd |
- rfbLog("rfbProcessFileTransferReadBuffer(%dlen)\n", length);
|
|
|
9b8edd |
+ We later alloc length+1, which might wrap around on 32-bit systems if length equals
|
|
|
9b8edd |
+ 0XFFFFFFFF, i.e. SIZE_MAX for 32-bit systems. On 64-bit systems, a length of 0XFFFFFFFF
|
|
|
9b8edd |
+ will safely be allocated since this check will never trigger and malloc() can digest length+1
|
|
|
9b8edd |
+ without problems as length is a uint32_t.
|
|
|
9b8edd |
+ We also later pass length to rfbReadExact() that expects a signed int type and
|
|
|
9b8edd |
+ that might wrap on platforms with a 32-bit int type if length is bigger
|
|
|
9b8edd |
+ than 0X7FFFFFFF.
|
|
|
9b8edd |
*/
|
|
|
9b8edd |
+ if(length == SIZE_MAX || length > INT_MAX) {
|
|
|
9b8edd |
+ rfbErr("rfbProcessFileTransferReadBuffer: too big file transfer length requested: %u", (unsigned int)length);
|
|
|
9b8edd |
+ rfbCloseClient(cl);
|
|
|
9b8edd |
+ return NULL;
|
|
|
9b8edd |
+ }
|
|
|
9b8edd |
+
|
|
|
9b8edd |
if (length>0) {
|
|
|
9b8edd |
- buffer=malloc(length+1);
|
|
|
9b8edd |
+ buffer=malloc((size_t)length+1);
|
|
|
9b8edd |
if (buffer!=NULL) {
|
|
|
9b8edd |
if ((n = rfbReadExact(cl, (char *)buffer, length)) <= 0) {
|
|
|
9b8edd |
if (n != 0)
|
|
|
9b8edd |
--
|
|
|
9b8edd |
2.17.2
|
|
|
9b8edd |
|