From nobody Thu Nov 13 21:53:33 2025 Delivered-To: importer@patchew.org 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; Authentication-Results: mx.zohomail.com; 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=fail(p=none dis=none) header.from=virtuozzo.com ARC-Seal: i=1; a=rsa-sha256; t=1583161860; cv=none; d=zohomail.com; s=zohoarc; b=F248YFGlqkTeW91oHqnHRFF06L43hwVB0PYDUDLlWjYRXMIQrZ4TSryugdrLfbNBNIxhsSZ1FJKATWvo8GiMM7z5ewwafAUSHWZP5MTMs7tB4nhg+FN3h8qitMatMsaz+j60QjrZHE62PESDlDty1xGhSknjnFiwXC22fAMmGL8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1583161860; 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=VWNsM/6J94skW+4a+bLYlhfGom5oOu/Ar9CKowHezWs=; b=gSId6Q4dWYxy8FObRwVInNx85PuU0tvNpCMKwMnRJtjJkU9QGRRSq/yfRyXuN43q1bgtalc9JcLEV+1I0Bz0+pX0Ne0eUOVrNmAVu9WjWuTBYma3T5wbS3URTrKHEiwuK4hFgJ/7obzZjzLUnxfDG2/zhAog/G0sq8qSdW/JZOg= ARC-Authentication-Results: i=1; mx.zohomail.com; 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=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1583161860370169.92843055450862; Mon, 2 Mar 2020 07:11:00 -0800 (PST) Received: from localhost ([::1]:33842 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j8mih-0005Wa-42 for importer@patchew.org; Mon, 02 Mar 2020 10:10:59 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:37488) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j8mhX-0004lc-Jw for qemu-devel@nongnu.org; Mon, 02 Mar 2020 10:09:48 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j8mhW-0003n2-KB for qemu-devel@nongnu.org; Mon, 02 Mar 2020 10:09:47 -0500 Received: from relay.sw.ru ([185.231.240.75]:33796) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1j8mhT-0003m9-M3; Mon, 02 Mar 2020 10:09:43 -0500 Received: from vovaso.qa.sw.ru ([10.94.3.0] helo=kvm.qa.sw.ru) by relay.sw.ru with esmtp (Exim 4.92.3) (envelope-from ) id 1j8mhK-0006IJ-6c; Mon, 02 Mar 2020 18:09:34 +0300 From: Vladimir Sementsov-Ogievskiy To: qemu-block@nongnu.org Subject: [PATCH] block/qcow2-threads: fix qcow2_decompress Date: Mon, 2 Mar 2020 18:09:30 +0300 Message-Id: <20200302150930.16218-1-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.21.0 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 185.231.240.75 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kwolf@redhat.com, vsementsov@virtuozzo.com, qemu-stable@nongnu.org, qemu-devel@nongnu.org, dplotnikov@virtuozzo.com, mreitz@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" On success path we return what inflate() returns instead of 0. And it most probably works for Z_STREAM_END as it is positive, but is definitely broken for Z_BUF_ERROR. While being here, switch to errno return code, to be closer to qcow2_compress API (and usual expectations). Revert condition in if to be more positive. Drop dead initialization of ret. Cc: qemu-stable@nongnu.org # v4.0 Fixes: 341926ab83e2b Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Alberto Garcia Reviewed-by: J=C3=A1n Tomko --- Hi! Reviewing Den's series about zstd in qcow2 support, I found an existing bug. Let's fix it. This is to be a new base of zstd series. block/qcow2-threads.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/block/qcow2-threads.c b/block/qcow2-threads.c index 8f5a0d1ebe..0d193d1614 100644 --- a/block/qcow2-threads.c +++ b/block/qcow2-threads.c @@ -128,12 +128,12 @@ static ssize_t qcow2_compress(void *dest, size_t dest= _size, * @src - source buffer, @src_size bytes * * Returns: 0 on success - * -1 on fail + * -EIO on fail */ static ssize_t qcow2_decompress(void *dest, size_t dest_size, const void *src, size_t src_size) { - int ret =3D 0; + int ret; z_stream strm; =20 memset(&strm, 0, sizeof(strm)); @@ -144,17 +144,19 @@ static ssize_t qcow2_decompress(void *dest, size_t de= st_size, =20 ret =3D inflateInit2(&strm, -12); if (ret !=3D Z_OK) { - return -1; + return -EIO; } =20 ret =3D inflate(&strm, Z_FINISH); - if ((ret !=3D Z_STREAM_END && ret !=3D Z_BUF_ERROR) || strm.avail_out = !=3D 0) { + if ((ret =3D=3D Z_STREAM_END || ret =3D=3D Z_BUF_ERROR) && strm.avail_= out =3D=3D 0) { /* * We approve Z_BUF_ERROR because we need @dest buffer to be fille= d, but * @src buffer may be processed partly (because in qcow2 we know s= ize of * compressed data with precision of one sector) */ - ret =3D -1; + ret =3D 0; + } else { + ret =3D -EIO; } =20 inflateEnd(&strm); --=20 2.21.0