From nobody Tue Apr 7 21:28:22 2026 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 ARC-Seal: i=1; a=rsa-sha256; t=1773258077; cv=none; d=zohomail.com; s=zohoarc; b=A17lsR7PaTdnPK62qhUSiDqJDtLBKBZGIwTF1m0undS7nAdF3/0ib0+sTzBUOQiHC8SY64y1rHIsZ10sADjqR2DieKWLfnqJ1vqFXEIPuTK/6YWj3zFk/NFUAV7pHNsixL5GcnySq21+lWTY//fwGSI8fuFk3c/AHXJQcqsl0gY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773258077; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=Dl/OWycXX4IMvlBB4pPL04b1/jdgsuGYMcxHCEpsNRo=; b=VlIvBxpxbT2hk+6AoGKVFwTVuBL7QPjDlr0jmXBpkYgsLdvPBOoLZNa+FpmR63+KpzIFj3X4SfoGcdWnuh8lGuCOUc0XiAL3NxV9BeMzQRPkiC8HloAAS8ak0GzMDdCEIjHYKJmy3tS6GwLkIk1kyt1BrquQjfM/U4qqMmfPmuk= 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1773258077061920.6984589120865; Wed, 11 Mar 2026 12:41:17 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1w0PNX-0004jI-J7; Wed, 11 Mar 2026 15:37:59 -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 1w0PNV-0004dX-6t; Wed, 11 Mar 2026 15:37:57 -0400 Received: from isrv.corpit.ru ([212.248.84.144]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1w0PNT-0000VG-Ln; Wed, 11 Mar 2026 15:37:56 -0400 Received: from tsrv.corpit.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id ED74719210B; Wed, 11 Mar 2026 22:34:28 +0300 (MSK) Received: from think4mjt.tls.msk.ru (mjtthink.wg.tls.msk.ru [192.168.177.146]) by tsrv.corpit.ru (Postfix) with ESMTP id 318A837C470; Wed, 11 Mar 2026 22:35:07 +0300 (MSK) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tls.msk.ru; s=202602; t=1773257668; bh=snqvXBZiy7swWW5vj6bRvOATZK4yLblfbZJNO3MMtsA=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=ka+aB5vtWb85H8nIL37trQMwmrkVq5Qh6/T+Qaq8zRfs52+DetSv4AzS+lHVzLryw HLGdBngqUHQheKXPqQZPPTiaQWUM+aBW54bG7RdeWcLeyVhqepzzIJHOu7xAUaztOS r2APWhqsVflKZPMZ2Sy7c7Vi01qIuM+0J5MHkJ1cah/v73eGOUMNhMVMliN4hJxV/w ueYMNCpLNGGG/HDWLJx8MF7c0129dJaRyOS/ZaWiYfFNqtyWs/KOkIZ0e8uiV7r8c4 yf/mDoCzP1B4bLtAbLOJTTtsLZmNYI15wd/BzGd1bCLXbynDNoRCDx5sgXa9qWQzHF lMnvZQ1SbkSzg== From: Michael Tokarev To: qemu-devel@nongnu.org Cc: qemu-stable@nongnu.org, "Halil Oktay (oblivionsage)" , Kevin Wolf , Michael Tokarev Subject: [Stable-10.2.2 35/53] block/vmdk: fix OOB read in vmdk_read_extent() Date: Wed, 11 Mar 2026 22:34:28 +0300 Message-ID: <20260311193449.1096110-35-mjt@tls.msk.ru> X-Mailer: git-send-email 2.47.3 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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=212.248.84.144; envelope-from=mjt@tls.msk.ru; helo=isrv.corpit.ru X-Spam_score_int: -2 X-Spam_score: -0.3 X-Spam_bar: / X-Spam_report: (-0.3 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.819, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.903, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development 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 @tls.msk.ru) X-ZM-MESSAGEID: 1773258077638158500 Content-Type: text/plain; charset="utf-8" From: "Halil Oktay (oblivionsage)" Bounds check for marker.size doesn't account for the 12-byte marker header, allowing zlib to read past the allocated buffer. Move the check inside the has_marker block and subtract the marker size. Fixes: CVE-2026-2243 Reported-by: Halil Oktay (oblivionsage) Signed-off-by: Halil Oktay (oblivionsage) Reviewed-by: Kevin Wolf Signed-off-by: Kevin Wolf (cherry picked from commit cfda94eddb6c9c49b66461c950b22845a46a75c9) Signed-off-by: Michael Tokarev diff --git a/block/vmdk.c b/block/vmdk.c index 89e89cd10e..cd8b4ec7c8 100644 --- a/block/vmdk.c +++ b/block/vmdk.c @@ -1951,10 +1951,10 @@ vmdk_read_extent(VmdkExtent *extent, int64_t cluste= r_offset, marker =3D (VmdkGrainMarker *)cluster_buf; compressed_data =3D marker->data; data_len =3D le32_to_cpu(marker->size); - } - if (!data_len || data_len > buf_bytes) { - ret =3D -EINVAL; - goto out; + if (!data_len || data_len > buf_bytes - sizeof(VmdkGrainMarker)) { + ret =3D -EINVAL; + goto out; + } } ret =3D uncompress(uncomp_buf, &buf_len, compressed_data, data_len); if (ret !=3D Z_OK) { --=20 2.47.3