From nobody Wed Nov 12 10:09:31 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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 (zoho.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=1569857143; cv=none; d=zoho.com; s=zohoarc; b=hRb4tIW9L+VkwJqk27EjUyKvnka0mRMPjZZA0e+KmzMRol2PNg4DfQ9pgF9oh+cX8Yo19a90aiDtCV3FZRVo3eM83AL2SPl3KarVMPCuc3HiIZ4HVopJ8gGKFzewAUDMmR6Zhe1xYIjf2iWEYOMBCVyVzphISa/xsAwuSz7h29c= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1569857143; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=xuQsMBHkaTqD+MJJU+6+Q2FQUrO2Qs0mm9xUKqgUXZE=; b=WMQ6nXzyhQq9yPwdbj08MTdecVKp0SJbTxMcp3zZY4whPGGBRu0EUhrwONxzOurL1ImUcRo7naO3V+zWBzYbn9uv5oDDYdIjzojxHufOqEzFrI+z21atLYsQITobD1vHa2mPnHAf3MS1Y+c/qrVo8iZmWn5AEfK4GJub+lgOx1A= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.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 1569857143582267.0837267756756; Mon, 30 Sep 2019 08:25:43 -0700 (PDT) Received: from localhost ([::1]:53722 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iExYT-0002Co-UJ for importer@patchew.org; Mon, 30 Sep 2019 11:25:41 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60085) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iExOJ-0004YT-SE for qemu-devel@nongnu.org; Mon, 30 Sep 2019 11:15:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iExOI-0005tr-EU for qemu-devel@nongnu.org; Mon, 30 Sep 2019 11:15:11 -0400 Received: from relay.sw.ru ([185.231.240.75]:46692) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iExOF-0005op-9V; Mon, 30 Sep 2019 11:15:07 -0400 Received: from [10.94.3.0] (helo=kvm.qa.sw.ru) by relay.sw.ru with esmtp (Exim 4.92.2) (envelope-from ) id 1iExOB-0005tD-BC; Mon, 30 Sep 2019 18:15:03 +0300 From: Vladimir Sementsov-Ogievskiy To: qemu-block@nongnu.org Subject: [PATCH 01/10] hbitmap: introduce HBITMAP_MAX_ORIG_SIZE Date: Mon, 30 Sep 2019 18:14:53 +0300 Message-Id: <20190930151502.7829-2-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190930151502.7829-1-vsementsov@virtuozzo.com> References: <20190930151502.7829-1-vsementsov@virtuozzo.com> 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, fam@euphon.net, vsementsov@virtuozzo.com, qemu-devel@nongnu.org, mreitz@redhat.com, den@openvz.org, jsnow@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" Signed-off-by: Vladimir Sementsov-Ogievskiy --- include/qemu/hbitmap.h | 7 +++++++ util/hbitmap.c | 2 ++ 2 files changed, 9 insertions(+) diff --git a/include/qemu/hbitmap.h b/include/qemu/hbitmap.h index 1bf944ca3d..82317c5364 100644 --- a/include/qemu/hbitmap.h +++ b/include/qemu/hbitmap.h @@ -33,6 +33,13 @@ typedef struct HBitmapIter HBitmapIter; */ #define HBITMAP_LEVELS ((HBITMAP_LOG_MAX_SIZE / BITS_PER_LEVEL) + = 1) =20 +/* + * We have APIs which returns signed int64_t, to be able to return error. + * Therefore we can't handle bitmaps with absolute size larger than + * (INT64_MAX+1). Still, keep it INT64_MAX to be a bit safer. + */ +#define HBITMAP_MAX_ORIG_SIZE INT64_MAX + struct HBitmapIter { const HBitmap *hb; =20 diff --git a/util/hbitmap.c b/util/hbitmap.c index 757d39e360..df192234e3 100644 --- a/util/hbitmap.c +++ b/util/hbitmap.c @@ -708,6 +708,7 @@ HBitmap *hbitmap_alloc(uint64_t size, int granularity) HBitmap *hb =3D g_new0(struct HBitmap, 1); unsigned i; =20 + assert(size <=3D HBITMAP_MAX_ORIG_SIZE); hb->orig_size =3D size; =20 assert(granularity >=3D 0 && granularity < 64); @@ -738,6 +739,7 @@ void hbitmap_truncate(HBitmap *hb, uint64_t size) uint64_t num_elements =3D size; uint64_t old; =20 + assert(size <=3D HBITMAP_MAX_ORIG_SIZE); hb->orig_size =3D size; =20 /* Size comes in as logical elements, adjust for granularity. */ --=20 2.21.0