From: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
To: qemu-block@nongnu.org, qemu-devel@nongnu.org
Cc: kwolf@redhat.com, mreitz@redhat.com, armbru@redhat.com,
eblake@redhat.com, jsnow@redhat.com, famz@redhat.com,
den@openvz.org, stefanha@redhat.com, vsementsov@virtuozzo.com,
pbonzini@redhat.com
Subject: [Qemu-devel] [PATCH 13/22] qcow2-bitmap: check constraints
Date: Fri, 30 Sep 2016 13:53:19 +0300 [thread overview]
Message-ID: <1475232808-4852-14-git-send-email-vsementsov@virtuozzo.com> (raw)
In-Reply-To: <1475232808-4852-1-git-send-email-vsementsov@virtuozzo.com>
Check bitmap header constraints as specified in docs/specs/qcow2.txt
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
---
block/qcow2-bitmap.c | 39 +++++++++++++++++++++++++++++++++++++++
1 file changed, 39 insertions(+)
diff --git a/block/qcow2-bitmap.c b/block/qcow2-bitmap.c
index 8cf40f0..1c3abea 100644
--- a/block/qcow2-bitmap.c
+++ b/block/qcow2-bitmap.c
@@ -154,6 +154,34 @@ static inline void bitmap_directory_to_be(uint8_t *dir, size_t size)
}
}
+static int check_constraints(BlockDriverState *bs, Qcow2BitmapDirEntry *h)
+{
+ BDRVQcow2State *s = bs->opaque;
+ uint64_t phys_bitmap_bytes =
+ (uint64_t)h->bitmap_table_size * s->cluster_size;
+ uint64_t max_virtual_bits = (phys_bitmap_bytes * 8) << h->granularity_bits;
+ int64_t nb_sectors = bdrv_nb_sectors(bs);
+
+ if (nb_sectors < 0) {
+ return nb_sectors;
+ }
+
+ int fail =
+ ((h->bitmap_table_size == 0) != (h->bitmap_table_offset == 0)) ||
+ (h->bitmap_table_offset % s->cluster_size) ||
+ (h->bitmap_table_size > BME_MAX_TABLE_SIZE) ||
+ (phys_bitmap_bytes > BME_MAX_PHYS_SIZE) ||
+ (h->bitmap_table_offset != 0 &&
+ (nb_sectors << BDRV_SECTOR_BITS) > max_virtual_bits) ||
+ (h->granularity_bits > BME_MAX_GRANULARITY_BITS) ||
+ (h->granularity_bits < BME_MIN_GRANULARITY_BITS) ||
+ (h->flags & BME_RESERVED_FLAGS) ||
+ (h->name_size > BME_MAX_NAME_SIZE) ||
+ (h->type != BT_DIRTY_TRACKING_BITMAP);
+
+ return fail ? -EINVAL : 0;
+}
+
static void clear_bitmap_table(BlockDriverState *bs, uint64_t *bitmap_table,
uint32_t bitmap_table_size)
{
@@ -372,6 +400,12 @@ static uint8_t *directory_read(BlockDriverState *bs,
bdrv_get_device_or_node_name(bs));
goto fail;
}
+
+ ret = check_constraints(bs, e);
+ if (ret < 0) {
+ error_setg(errp, "Bitmap doesn't satisfy the constraints.");
+ goto fail;
+ }
}
assert((uint8_t *)e == dir_end);
@@ -713,6 +747,11 @@ static int store_bitmap(BlockDriverState *bs,
entry->extra_data_size = 0;
memcpy(entry + 1, bm_name, entry->name_size);
+ ret = check_constraints(bs, entry);
+ if (ret < 0) {
+ goto fail;
+ }
+
return 0;
fail:
--
1.8.3.1
next prev parent reply other threads:[~2016-09-30 10:53 UTC|newest]
Thread overview: 100+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-09-30 10:53 [Qemu-devel] [PATCH v7 00/22] qcow2: persistent dirty bitmaps Vladimir Sementsov-Ogievskiy
2016-09-30 10:53 ` [Qemu-devel] [PATCH 01/22] hbitmap: improve dirty iter Vladimir Sementsov-Ogievskiy
2016-10-01 13:52 ` Max Reitz
2016-09-30 10:53 ` [Qemu-devel] [PATCH 02/22] tests: add hbitmap iter test Vladimir Sementsov-Ogievskiy
2016-10-01 14:02 ` Max Reitz
2016-09-30 10:53 ` [Qemu-devel] [PATCH 03/22] block: fix bdrv_dirty_bitmap_granularity signature Vladimir Sementsov-Ogievskiy
2016-09-30 10:53 ` [Qemu-devel] [PATCH 04/22] block/dirty-bitmap: add deserialize_ones func Vladimir Sementsov-Ogievskiy
2016-09-30 10:53 ` [Qemu-devel] [PATCH 05/22] qcow2-bitmap: structs and consts Vladimir Sementsov-Ogievskiy
2016-10-01 14:34 ` Max Reitz
2016-10-01 14:56 ` Max Reitz
2016-10-07 13:11 ` Vladimir Sementsov-Ogievskiy
2016-10-11 11:50 ` Vladimir Sementsov-Ogievskiy
2016-10-12 18:20 ` Max Reitz
2016-09-30 10:53 ` [Qemu-devel] [PATCH 06/22] qcow2: add dirty bitmaps extension Vladimir Sementsov-Ogievskiy
2016-10-01 14:46 ` Max Reitz
2016-10-11 12:09 ` Vladimir Sementsov-Ogievskiy
2016-10-12 18:21 ` Max Reitz
2016-10-13 12:18 ` Vladimir Sementsov-Ogievskiy
2016-09-30 10:53 ` [Qemu-devel] [PATCH 07/22] qcow2-bitmap: introduce auto-loading bitmaps Vladimir Sementsov-Ogievskiy
2016-10-01 16:26 ` Max Reitz
2016-10-14 18:44 ` Vladimir Sementsov-Ogievskiy
2016-10-15 17:03 ` Max Reitz
2016-10-15 17:22 ` Vladimir Sementsov-Ogievskiy
2016-10-20 12:22 ` Vladimir Sementsov-Ogievskiy
2016-10-21 19:49 ` Max Reitz
2016-10-07 19:25 ` Max Reitz
2016-10-21 11:59 ` Vladimir Sementsov-Ogievskiy
2016-10-21 19:56 ` Max Reitz
2016-09-30 10:53 ` [Qemu-devel] [PATCH 08/22] block/dirty-bitmap: add autoload field to BdrvDirtyBitmap Vladimir Sementsov-Ogievskiy
2016-10-07 17:05 ` Max Reitz
2016-09-30 10:53 ` [Qemu-devel] [PATCH 09/22] block: introduce persistent dirty bitmaps Vladimir Sementsov-Ogievskiy
2016-10-07 17:54 ` Max Reitz
2016-10-11 13:11 ` Vladimir Sementsov-Ogievskiy
2016-10-12 18:24 ` Max Reitz
2016-10-07 19:28 ` Max Reitz
2016-10-12 11:38 ` Vladimir Sementsov-Ogievskiy
2016-10-12 12:30 ` Vladimir Sementsov-Ogievskiy
2016-10-12 18:25 ` Max Reitz
2016-09-30 10:53 ` [Qemu-devel] [PATCH 10/22] block/dirty-bitmap: add bdrv_dirty_bitmap_next() Vladimir Sementsov-Ogievskiy
2016-10-07 18:11 ` Max Reitz
2016-09-30 10:53 ` [Qemu-devel] [PATCH 11/22] qcow2-bitmap: add qcow2_store_persistent_bitmaps() Vladimir Sementsov-Ogievskiy
2016-10-07 19:24 ` Max Reitz
2016-10-13 16:48 ` Vladimir Sementsov-Ogievskiy
2016-10-15 16:40 ` Max Reitz
2016-10-17 17:19 ` Vladimir Sementsov-Ogievskiy
2016-10-21 19:44 ` Max Reitz
2016-10-21 21:04 ` Eric Blake
2016-10-17 17:57 ` Vladimir Sementsov-Ogievskiy
2016-10-17 17:58 ` [Qemu-devel] DROP THIS " Vladimir Sementsov-Ogievskiy
2016-09-30 10:53 ` [Qemu-devel] [PATCH 12/22] qcow2-bitmap: add IN_USE flag Vladimir Sementsov-Ogievskiy
2016-10-07 19:44 ` Max Reitz
2016-10-21 15:34 ` Vladimir Sementsov-Ogievskiy
2016-10-21 19:58 ` Max Reitz
2016-10-24 10:32 ` Vladimir Sementsov-Ogievskiy
2016-10-24 11:35 ` Vladimir Sementsov-Ogievskiy
2016-10-24 17:08 ` Max Reitz
2016-10-24 17:18 ` Max Reitz
2016-10-25 10:53 ` Vladimir Sementsov-Ogievskiy
2016-10-26 9:04 ` Vladimir Sementsov-Ogievskiy
2016-10-26 9:21 ` Vladimir Sementsov-Ogievskiy
2016-10-26 12:13 ` Vladimir Sementsov-Ogievskiy
2016-10-26 13:02 ` Vladimir Sementsov-Ogievskiy
2016-10-26 15:28 ` Max Reitz
2016-11-07 16:12 ` Vladimir Sementsov-Ogievskiy
2016-11-07 16:18 ` Max Reitz
2016-10-24 16:54 ` Max Reitz
2016-09-30 10:53 ` Vladimir Sementsov-Ogievskiy [this message]
2016-10-07 19:54 ` [Qemu-devel] [PATCH 13/22] qcow2-bitmap: check constraints Max Reitz
2016-09-30 10:53 ` [Qemu-devel] [PATCH 14/22] qcow2: delete bitmaps on truncate Vladimir Sementsov-Ogievskiy
2016-10-07 19:58 ` Max Reitz
2016-09-30 10:53 ` [Qemu-devel] [PATCH 15/22] qcow2-bitmap: add autoclear bit Vladimir Sementsov-Ogievskiy
2016-10-07 20:11 ` Max Reitz
2016-10-24 14:25 ` Vladimir Sementsov-Ogievskiy
2016-10-24 17:21 ` Max Reitz
2016-09-30 10:53 ` [Qemu-devel] [PATCH 16/22] qmp: add persistent flag to block-dirty-bitmap-add Vladimir Sementsov-Ogievskiy
2016-10-07 19:52 ` Eric Blake
2016-10-24 14:44 ` Vladimir Sementsov-Ogievskiy
2016-10-10 16:08 ` Max Reitz
2016-10-24 15:12 ` Vladimir Sementsov-Ogievskiy
2016-10-24 17:30 ` Max Reitz
2016-10-25 11:05 ` Vladimir Sementsov-Ogievskiy
2016-09-30 10:53 ` [Qemu-devel] [PATCH 17/22] qmp: add autoload parameter " Vladimir Sementsov-Ogievskiy
2016-10-07 19:53 ` Eric Blake
2016-10-10 16:25 ` Max Reitz
2016-10-24 15:55 ` Vladimir Sementsov-Ogievskiy
2016-09-30 10:53 ` [Qemu-devel] [PATCH 18/22] qapi: add md5 checksum of last dirty bitmap level to query-block Vladimir Sementsov-Ogievskiy
2016-10-10 16:44 ` Max Reitz
2016-10-10 17:03 ` Max Reitz
2016-10-10 19:22 ` Eric Blake
2016-09-30 10:53 ` [Qemu-devel] [PATCH 19/22] iotests: test qcow2 persistent dirty bitmap Vladimir Sementsov-Ogievskiy
2016-10-10 17:04 ` Max Reitz
2016-09-30 10:53 ` [Qemu-devel] [PATCH 20/22] qcow2-dirty-bitmap: refcounts Vladimir Sementsov-Ogievskiy
2016-10-10 17:59 ` Max Reitz
2016-09-30 10:53 ` [Qemu-devel] [PATCH 21/22] specs/qcow2: fix bitmap granularity qemu-specific note Vladimir Sementsov-Ogievskiy
2016-10-07 20:18 ` Eric Blake
2016-11-09 16:43 ` Vladimir Sementsov-Ogievskiy
2016-09-30 10:53 ` [Qemu-devel] [PATCH 22/22] specs/qcow2: do not use wording 'bitmap header' Vladimir Sementsov-Ogievskiy
2016-10-07 20:20 ` Eric Blake
2016-10-01 13:37 ` [Qemu-devel] [PATCH v7 00/22] qcow2: persistent dirty bitmaps Max Reitz
2016-10-13 18:11 ` John Snow
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1475232808-4852-14-git-send-email-vsementsov@virtuozzo.com \
--to=vsementsov@virtuozzo.com \
--cc=armbru@redhat.com \
--cc=den@openvz.org \
--cc=eblake@redhat.com \
--cc=famz@redhat.com \
--cc=jsnow@redhat.com \
--cc=kwolf@redhat.com \
--cc=mreitz@redhat.com \
--cc=pbonzini@redhat.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=stefanha@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).