From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id AAE5CC32792 for ; Mon, 30 Sep 2019 15:25:38 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 8024920815 for ; Mon, 30 Sep 2019 15:25:38 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8024920815 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=virtuozzo.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:53722 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iExYP-0002Co-3F for qemu-devel@archiver.kernel.org; Mon, 30 Sep 2019 11:25:37 -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: 8bit 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+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" 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) +/* + * 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; 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 = g_new0(struct HBitmap, 1); unsigned i; + assert(size <= HBITMAP_MAX_ORIG_SIZE); hb->orig_size = size; assert(granularity >= 0 && granularity < 64); @@ -738,6 +739,7 @@ void hbitmap_truncate(HBitmap *hb, uint64_t size) uint64_t num_elements = size; uint64_t old; + assert(size <= HBITMAP_MAX_ORIG_SIZE); hb->orig_size = size; /* Size comes in as logical elements, adjust for granularity. */ -- 2.21.0