From nobody Fri May 10 11:08:26 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1688460176; cv=none; d=zohomail.com; s=zohoarc; b=ehd7Q3xwMq/42JbfiFMrNN3fobfAaZCu3I3/QvjDLiGX6vkvD8OrZljxqIC1N7wYnj+h6EsIFQ+NpnIeW573t6FcP8wCNVgW7jQYWJZrI8WzgGZFpAho0bZEJp17ZYoaaHW2wTszJo8o5Dk6RjYNvEoq5NNqfUnKr6F+ciKdbwY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1688460176; h=Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=Ng/ecASVryPUWeUCjgvL1EG9cG/qRB0bmFWKEPyPWG8=; b=CJ/7xcOWhFx6RVrHYR49L4/STaCmHq/Zp3QehSA4/J9GzNSiiFhVsh7YdUKLrWzNd9b8ZDdq2k6sft5WuvOzMM+93evKLlGpof4E+tVJnV4bW8H6ISBC/1ozV8WkHaQr6oCC7SzatNDJQb5/DQaetwYm1om8DnYmbIy5WcTGe2Q= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1688460176681895.5899467363452; Tue, 4 Jul 2023 01:42:56 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qGbc8-00029d-3d; Tue, 04 Jul 2023 04:42:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qGbc4-00029T-Pt for qemu-devel@nongnu.org; Tue, 04 Jul 2023 04:42:20 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qGbc3-0000PD-4w for qemu-devel@nongnu.org; Tue, 04 Jul 2023 04:42:20 -0400 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-343-hv990zZ6Nl-HETGtMWLvZQ-1; Tue, 04 Jul 2023 04:42:14 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 363AA8A2E21; Tue, 4 Jul 2023 08:42:14 +0000 (UTC) Received: from f38-work.redhat.com (unknown [10.39.193.5]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 33B53C00049; Tue, 4 Jul 2023 08:42:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1688460137; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=Ng/ecASVryPUWeUCjgvL1EG9cG/qRB0bmFWKEPyPWG8=; b=HW2IibWYdRcUDwFI/gURIuFTQxblPKkjxGkBufIdDNIdlYBbnzux2nA5dVDczouQ5vtCPa s/i3ythFYlx6A3XUd0lLLhfMB2RifA5NHFm0hFvYThD1lvKf9NjeQqtU4iITFarwhRvOkX yjpu/x1UDMieNh8gs7qMDrpJI0G86b8= X-MC-Unique: hv990zZ6Nl-HETGtMWLvZQ-1 From: Mauro Matteo Cascella To: qemu-devel@nongnu.org Cc: mcascell@redhat.com, kraxel@redhat.com, marcandre.lureau@redhat.com, kevin.denis@synacktiv.com Subject: [PATCH] ui/vnc-clipboard: fix infinite loop in inflate_buffer (CVE-2023-3255) Date: Tue, 4 Jul 2023 10:41:22 +0200 Message-ID: <20230704084210.101822-1-mcascell@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.8 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=mcascell@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1688460178681100003 Content-Type: text/plain; charset="utf-8" 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 Signed-off-by: Mauro Matteo Cascella Reviewed-by: Marc-Andr=C3=A9 Lureau Tested-by: Marc-Andr=C3=A9 Lureau --- 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 8aeadfaa21..c759be3438 100644 --- a/ui/vnc-clipboard.c +++ b/ui/vnc-clipboard.c @@ -50,8 +50,11 @@ static uint8_t *inflate_buffer(uint8_t *in, uint32_t in_= len, uint32_t *size) ret =3D inflate(&stream, Z_FINISH); switch (ret) { case Z_OK: - case Z_STREAM_END: break; + case Z_STREAM_END: + *size =3D stream.total_out; + inflateEnd(&stream); + return out; case Z_BUF_ERROR: out_len <<=3D 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) } } =20 - *size =3D stream.total_out; - inflateEnd(&stream); - - return out; - err_end: inflateEnd(&stream); err: --=20 2.41.0