]> xenbits.xensource.com Git - qemu-xen.git/commitdiff
hbitmap: assert that we don't create bitmap larger than INT64_MAX
authorVladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Wed, 5 Feb 2020 11:20:32 +0000 (14:20 +0300)
committerJohn Snow <jsnow@redhat.com>
Wed, 18 Mar 2020 18:03:46 +0000 (14:03 -0400)
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 maximum to be INT64_MAX which is a bit
safer.

Note, that bitmaps are used to represent disk images, which can't
exceed INT64_MAX anyway.

Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: John Snow <jsnow@redhat.com>
Message-id: 20200205112041.6003-2-vsementsov@virtuozzo.com
Signed-off-by: John Snow <jsnow@redhat.com>
util/hbitmap.c

index 242c6e519ce1715a54d6183c3648d009fedb9202..7f9b3e0cd7e389aa30993c842fae9cc1c823eaab 100644 (file)
@@ -716,6 +716,7 @@ HBitmap *hbitmap_alloc(uint64_t size, int granularity)
     HBitmap *hb = g_new0(struct HBitmap, 1);
     unsigned i;
 
+    assert(size <= INT64_MAX);
     hb->orig_size = size;
 
     assert(granularity >= 0 && granularity < 64);
@@ -746,6 +747,7 @@ void hbitmap_truncate(HBitmap *hb, uint64_t size)
     uint64_t num_elements = size;
     uint64_t old;
 
+    assert(size <= INT64_MAX);
     hb->orig_size = size;
 
     /* Size comes in as logical elements, adjust for granularity. */