This repository has been archived by the owner on Apr 12, 2021. It is now read-only.
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Security fixes for: * CVE-2019-8287 * CVE-2019-15678 * CVE-2019-15679 * CVE-2019-15680 mostly adapted from patches fixing similar issues in the actively maintained libvnc (#73970)
- Loading branch information
Showing
5 changed files
with
74 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,18 @@ | ||
Adapted from https://github.com/LibVNC/libvncserver/commit/c5ba3fee85a7ecbbca1df5ffd46d32b92757bc2a | ||
diff --git a/vncviewer/rfbproto.c b/vncviewer/rfbproto.c | ||
index 04b0230..47a6863 100644 | ||
--- a/vncviewer/rfbproto.c | ||
+++ b/vncviewer/rfbproto.c | ||
@@ -1217,6 +1217,12 @@ HandleRFBServerMessage() | ||
if (serverCutText) | ||
free(serverCutText); | ||
|
||
+ if (msg.sct.length > 1<<20) { | ||
+ fprintf(stderr,"Ignoring too big cut text length sent by server: %u B > 1 MB\n", | ||
+ (unsigned int)msg.sct.length); | ||
+ return False; | ||
+ } | ||
+ | ||
serverCutText = malloc(msg.sct.length+1); | ||
|
||
if (!ReadFromRFBServer(serverCutText, msg.sct.length)) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,19 @@ | ||
Adapted from https://github.com/LibVNC/libvncserver/commit/c2c4b81e6cb3b485fb1ec7ba9e7defeb889f6ba7 | ||
diff --git a/vncviewer/rfbproto.c b/vncviewer/rfbproto.c | ||
index 04b0230..bd11b54 100644 | ||
--- a/vncviewer/rfbproto.c | ||
+++ b/vncviewer/rfbproto.c | ||
@@ -303,7 +303,12 @@ InitialiseRFBConnection(void) | ||
si.format.blueMax = Swap16IfLE(si.format.blueMax); | ||
si.nameLength = Swap32IfLE(si.nameLength); | ||
|
||
- /* FIXME: Check arguments to malloc() calls. */ | ||
+ if (si.nameLength > 1<<20) { | ||
+ fprintf(stderr, "Too big desktop name length sent by server: %lu B > 1 MB\n", | ||
+ (unsigned long)si.nameLength); | ||
+ return False; | ||
+ } | ||
+ | ||
desktopName = malloc(si.nameLength + 1); | ||
if (!desktopName) { | ||
fprintf(stderr, "Error allocating memory for desktop name, %lu bytes\n", |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,16 @@ | ||
diff --git a/vncviewer/zlib.c b/vncviewer/zlib.c | ||
index 80c4eee..76998d8 100644 | ||
--- a/vncviewer/zlib.c | ||
+++ b/vncviewer/zlib.c | ||
@@ -55,6 +55,11 @@ HandleZlibBPP (int rx, int ry, int rw, int rh) | ||
raw_buffer_size = (( rw * rh ) * ( BPP / 8 )); | ||
raw_buffer = (char*) malloc( raw_buffer_size ); | ||
|
||
+ if ( raw_buffer == NULL ) { | ||
+ fprintf(stderr, | ||
+ "couldn't allocate raw_buffer in HandleZlibBPP"); | ||
+ return False; | ||
+ } | ||
} | ||
|
||
if (!ReadFromRFBServer((char *)&hdr, sz_rfbZlibHeader)) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,14 @@ | ||
Adapted from https://github.com/LibVNC/libvncserver/commit/7b1ef0ffc4815cab9a96c7278394152bdc89dc4d | ||
diff --git a/vncviewer/corre.c b/vncviewer/corre.c | ||
index c846a10..a4c272d 100644 | ||
--- a/vncviewer/corre.c | ||
+++ b/vncviewer/corre.c | ||
@@ -56,7 +56,7 @@ HandleCoRREBPP (int rx, int ry, int rw, int rh) | ||
XChangeGC(dpy, gc, GCForeground, &gcv); | ||
XFillRectangle(dpy, desktopWin, gc, rx, ry, rw, rh); | ||
|
||
- if (!ReadFromRFBServer(buffer, hdr.nSubrects * (4 + (BPP / 8)))) | ||
+ if (hdr.nSubrects > BUFFER_SIZE / (4 + (BPP / 8)) || !ReadFromRFBServer(buffer, hdr.nSubrects * (4 + (BPP / 8)))) | ||
return False; | ||
|
||
ptr = (CARD8 *)buffer; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters