80a22cff37
- hw/virtio/virtio-pmem: Replace impossible check by assertion - tests: Fix printf format string in acpi-utils.c - softmmu/dirtylimit: Add parameter check for hmp "set_vcpu_dirty_limit" - disas/riscv: Fix the typo of inverted order of pmpaddr13 and pmpaddr14 - qga: Fix memory leak when output stream is unused - ui/vnc-clipboard: fix infinite loop in inflate_buffer (CVE-2023-3255) - target/i386: Add few security fix bits in ARCH_CAPABILITIES into SapphireRapids CPU model - target/i386: Add new bit definitions of MSR_IA32_ARCH_CAPABILITIES - target/i386: Allow MCDT_NO if host supports - target/i386: Add support for MCDT_NO in CPUID enumeration - target/i386: Export MSR_ARCH_CAPABILITIES bits to guests - target/i386: add support for FB_CLEAR feature - target/i386: add support for FLUSH_L1D feature - crypto: remove shadowed 'ret' variable - hw/i2c/pmbus_device: Fix modifying QOM class internals from instance - hw/arm/xlnx-zynqmp: fix unsigned error when checking the RPUs number Signed-off-by: Jiabo Feng <fengjiabo1@huawei.com>
59 lines
1.9 KiB
Diff
59 lines
1.9 KiB
Diff
From 2858029a5dbdd3fab73b1884e296daa3f3f0b1a1 Mon Sep 17 00:00:00 2001
|
|
From: Mauro Matteo Cascella <mcascell@redhat.com>
|
|
Date: Tue, 4 Jul 2023 10:41:22 +0200
|
|
Subject: [PATCH] ui/vnc-clipboard: fix infinite loop in inflate_buffer
|
|
(CVE-2023-3255)
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
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).
|
|
|
|
Fixes: CVE-2023-3255
|
|
Fixes: 0bf41cab ("ui/vnc: clipboard support")
|
|
Reported-by: Kevin Denis <kevin.denis@synacktiv.com>
|
|
Signed-off-by: Mauro Matteo Cascella <mcascell@redhat.com>
|
|
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
|
|
Tested-by: Marc-André Lureau <marcandre.lureau@redhat.com>
|
|
Message-ID: <20230704084210.101822-1-mcascell@redhat.com>
|
|
---
|
|
ui/vnc-clipboard.c | 10 ++++------
|
|
1 file changed, 4 insertions(+), 6 deletions(-)
|
|
|
|
diff --git a/ui/vnc-clipboard.c b/ui/vnc-clipboard.c
|
|
index 67284b556c..c84599cfdb 100644
|
|
--- a/ui/vnc-clipboard.c
|
|
+++ b/ui/vnc-clipboard.c
|
|
@@ -51,8 +51,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)) {
|
|
@@ -67,11 +70,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.windows.1
|
|
|