aboutsummaryrefslogtreecommitdiff
path: root/block
diff options
context:
space:
mode:
authorKevin Wolf <kwolf@redhat.com>2014-05-15 16:10:11 +0200
committerKevin Wolf <kwolf@redhat.com>2014-05-19 11:36:49 +0200
commit42eb58179b3b215bb507da3262b682b8a2ec10b5 (patch)
tree5dd3e16d510ab10ee3d2c2aa843daa44ed34f25c /block
parent7159a45b2bf2dcb9f49f1e27d1d3d135a0247a2f (diff)
downloadqemu-42eb58179b3b215bb507da3262b682b8a2ec10b5.zip
qemu-42eb58179b3b215bb507da3262b682b8a2ec10b5.tar.gz
qemu-42eb58179b3b215bb507da3262b682b8a2ec10b5.tar.bz2
qcow1: Validate L2 table size (CVE-2014-0222)
Too large L2 table sizes cause unbounded allocations. Images actually created by qemu-img only have 512 byte or 4k L2 tables. To keep things consistent with cluster sizes, allow ranges between 512 bytes and 64k (in fact, down to 1 entry = 8 bytes is technically working, but L2 table sizes smaller than a cluster don't make a lot of sense). This also means that the number of bytes on the virtual disk that are described by the same L2 table is limited to at most 8k * 64k or 2^29, preventively avoiding any integer overflows. Cc: qemu-stable@nongnu.org Signed-off-by: Kevin Wolf <kwolf@redhat.com> Reviewed-by: Benoit Canet <benoit@irqsave.net>
Diffstat (limited to 'block')
-rw-r--r--block/qcow.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/block/qcow.c b/block/qcow.c
index e60df23..e8038e5 100644
--- a/block/qcow.c
+++ b/block/qcow.c
@@ -139,6 +139,14 @@ static int qcow_open(BlockDriverState *bs, QDict *options, int flags,
goto fail;
}
+ /* l2_bits specifies number of entries; storing a uint64_t in each entry,
+ * so bytes = num_entries << 3. */
+ if (header.l2_bits < 9 - 3 || header.l2_bits > 16 - 3) {
+ error_setg(errp, "L2 table size must be between 512 and 64k");
+ ret = -EINVAL;
+ goto fail;
+ }
+
if (header.crypt_method > QCOW_CRYPT_AES) {
error_setg(errp, "invalid encryption method in qcow header");
ret = -EINVAL;