ui/vnc-clipboard: fix infinite loop in inflate_buffer (CVE-2023-3255)
PATCH 1/1 ui/vnc-clipboard: fix infinite loop in inflate_buffer (CVE-2023-3255)
A wrong exit condition may lead to an infinite loop when inflating a valid zlib buffer containing some extra bytes in the inflate_buffer function. The bug only occurs post-authentication. Return the buffer immediately if the end of the compressed data has been reached (Z_STREAM_END).
--- ui/vnc-clipboard.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-)
ui/vnc-clipboard.c +4 -6
@@ -50,8 +50,11 @@ static uint8_t *inflate_buffer(uint8_t *in, uint32_t in_len, uint32_t *size) ret =inflate (&stream,Z_FINISH );switch (ret) {case Z_OK : -case Z_STREAM_END :break ; +case Z_STREAM_END : + *size = stream.total_out; +inflateEnd (&stream); +return out;case Z_BUF_ERROR : out_len <<=1 ;if (out_len > (1 <<20 )) {
@@ -66,11 +69,6 @@ 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:inflateEnd (&stream); err:
Signature · 1 line
2.41.0
Quoted 11 lines · Mauro Matteo Cascella
A wrong exit condition may lead to an infinite loop when inflating a valid zlib buffer containing some extra bytes in the
inflate_bufferfunction. The bug only occurs post-authentication. Return the buffer immediately if the end of the compressed data has been reached (Z_STREAM_END).Fixes CVE-2023-3255Fixes 0bf41cab ("ui/vnc: clipboard support")Reported-by Kevin Denis <[email protected]>Signed-off-by Mauro Matteo Cascella <[email protected]>
Note: we may want to disconnect the client when there are extra bytes in the message, or print some warnings.
Quoted 40 lines
--- ui/vnc-clipboard.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-)ui/vnc-clipboard.c +4
-1@@ -50,8 +50,11 @@ static uint8_t *inflate_buffer(uint8_t *in, uint32_t in_len, uint32_t *size) ret =inflate (&stream,Z_FINISH );switch (ret) {case Z_OK : -case Z_STREAM_END :break ; +case Z_STREAM_END : + *size = stream.total_out; +inflateEnd (&stream); +return out;case Z_BUF_ERROR : out_len <<=1 ;if (out_len > (1 << 20)) {ui/vnc-clipboard.c +0
-5@@ -66,11 +69,6 @@ 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:inflateEnd (&stream);err:
--
2.41.0
Signature · 1 line
Marc-André Lureau
Quoted 17 lines · Marc-André Lureau
Quoted 11 lines · Mauro Matteo Cascella
A wrong exit condition may lead to an infinite loop when inflating a valid zlib buffer containing some extra bytes in the
inflate_bufferfunction. The bug only occurs post-authentication. Return the buffer immediately if the end of the compressed data has been reached (Z_STREAM_END).Fixes CVE-2023-3255Fixes 0bf41cab ("ui/vnc: clipboard support")Reported-by Kevin Denis <[email protected]>Signed-off-by Mauro Matteo Cascella <[email protected]>
Quoted 4 lines
Tested-by Marc-André Lureau <[email protected]>Reviewed-by Marc-André Lureau <[email protected]>Note: we may want to disconnect the client when there are extra bytes in the message, or print some warnings.
Sure, I guess we can call vnc_disconnect_finish or vnc_client_error for disconnecting, not sure how to properly print warnings. Feel free to add that yourself when applying the patch. Or I can try to send v2 if you prefer.
Thanks,
Quoted 42 lines
Quoted 35 lines
--- ui/vnc-clipboard.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-)ui/vnc-clipboard.c +4
-7@@ -50,8 +50,11 @@ static uint8_t *inflate_buffer(uint8_t *in, uint32_t in_len, uint32_t *size) ret =inflate (&stream,Z_FINISH );switch (ret) {case Z_OK : -case Z_STREAM_END :break ; +case Z_STREAM_END : + *size = stream.total_out; +inflateEnd (&stream); +return out;case Z_BUF_ERROR : out_len <<=1 ;if (out_len > (1 <<20 )) {@@ -66,11 +69,6 @@ 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:inflateEnd (&stream); err: --Quoted 3 lines
2.41.0
--
Marc-André Lureau
Signature · 3 lines
Mauro Matteo Cascella Red Hat Product Security PGP-Key ID: BB3410B0
Quoted 22 lines · Mauro Matteo Cascella
Quoted 20 lines · Marc-André Lureau
Quoted 11 lines · Mauro Matteo Cascella
A wrong exit condition may lead to an infinite loop when inflating a valid zlib buffer containing some extra bytes in the
inflate_bufferfunction. The bug only occurs post-authentication. Return the buffer immediately if the end of the compressed data has been reached (Z_STREAM_END).Fixes CVE-2023-3255Fixes 0bf41cab ("ui/vnc: clipboard support")Reported-by Kevin Denis <[email protected]>Signed-off-by Mauro Matteo Cascella <[email protected]>Tested-by Marc-André Lureau <[email protected]>Reviewed-by Marc-André Lureau <[email protected]>
Quoted 6 lines
Quoted 1 line
Note: we may want to disconnect the client when there are extra bytes in the message, or print some warnings.
Sure, I guess we can call
vnc_disconnect_finishorvnc_client_errorfor disconnecting, not sure how to properly print warnings. Feel free to add that yourself when applying the patch. Or I can try to send v2 if you prefer.
Ping, for 8.1 and -stable?
Thanks,
/mjt