From nobody Mon May 6 00:07:53 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1635175980; cv=none; d=zohomail.com; s=zohoarc; b=H9YGweYZ6YlgopSIfQl87nV2042uz57xAS8chPhMGFViEd7HjpLGtQBXhTQwaTeNwKEyijWbnHQ4hTarTGWpeidR1dnh+1QQkTqd0xUjYVqMF43cgAaztEgbvV2uj5krLq5gKvUS6Epv7UaP5kM2uAhT4X3C7IOumNM5raa5Q7g= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1635175980; h=Content-Type:Content-Transfer-Encoding:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=NnSitAWAnYahMT+6AKfgDvyO+0kl38V6l/7AyTLDtgY=; b=C2RAy157/BblrEpZID/GLstzE5sa9dzpmwBSmmpHjCRViVj5yLPwlOoxVzBfV3g7+CYeXKy7oOGo/ZwRL8YwJXF7EfB7f9GeTNyU1uQI9kklH2p3YrVCaEVsBbeSVDRxcmxKZ/IniyPh4r8U5wzRLrTxToCa7tjQnptTmCcC7Lo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1635175980603264.55400047406306; Mon, 25 Oct 2021 08:33:00 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-215-n_bcT2hTOFiXqHUxRtnwYA-1; Mon, 25 Oct 2021 11:32:56 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 9550D879500; Mon, 25 Oct 2021 15:32:50 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 74B6C5DAA5; Mon, 25 Oct 2021 15:32:50 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 414E41801241; Mon, 25 Oct 2021 15:32:50 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 19PFWnv1015455 for ; Mon, 25 Oct 2021 11:32:49 -0400 Received: by smtp.corp.redhat.com (Postfix) id 83DB05DAA5; Mon, 25 Oct 2021 15:32:49 +0000 (UTC) Received: from virval.usersys.redhat.com (unknown [10.43.2.8]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 58B731815D for ; Mon, 25 Oct 2021 15:32:49 +0000 (UTC) Received: by virval.usersys.redhat.com (Postfix, from userid 500) id EF14F24014E; Mon, 25 Oct 2021 17:32:47 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1635175979; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=NnSitAWAnYahMT+6AKfgDvyO+0kl38V6l/7AyTLDtgY=; b=Dqc5EqodC+UXoVyCg2Z/UAVWGsFCGWcSt/iLnYscayNAZH60M6PEUgP1ZBat1wj4McPLn/ QFf0GyVVkOPrzYjuGU7CDeX0CRSb6GdH/m9t6OScM0OqPfmFxY2SNgEjolhgD1JYrEspTS xa6l7r49jNpwRZyfhNknzXr33eAgPEM= X-MC-Unique: n_bcT2hTOFiXqHUxRtnwYA-1 From: Jiri Denemark To: libvir-list@redhat.com Subject: [libvirt PATCH] storage_file: Compute QCOW2 cluster size as ULL Date: Mon, 25 Oct 2021 17:32:43 +0200 Message-Id: <41b208bdbb57dda4d24796fc60a0f6028bcdee9b.1635175963.git.jdenemar@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1635175981680100001 Content-Type: text/plain; charset="utf-8" While the QCOW2 cluster size is represented in only 4 bits in the QCOW2 header and thus 1 << cluster_size cannot overflow int, qcow2GetClusterSize is supposed to return unsigned long long so we can just compute the result as ULL rather than computing it as int and promoting to unsigned long long. Signed-off-by: Jiri Denemark Reviewed-by: Pavel Hrdina --- src/storage_file/storage_file_probe.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/storage_file/storage_file_probe.c b/src/storage_file/stora= ge_file_probe.c index f5bb8b7dbb..dc438a5e5d 100644 --- a/src/storage_file/storage_file_probe.c +++ b/src/storage_file/storage_file_probe.c @@ -487,7 +487,7 @@ qcow2GetClusterSize(const char *buf, clusterBits =3D virReadBufInt32BE(buf + QCOWX_HDR_CLUSTER_BITS_OFFSET); =20 if (clusterBits > 0) - return 1 << clusterBits; + return 1ULL << clusterBits; =20 return 0; } --=20 2.33.1