]> Git Repo - qemu.git/commitdiff
block/parallels: check new image size
authorKlim Kireev <[email protected]>
Wed, 27 Jul 2016 17:08:20 +0000 (20:08 +0300)
committerStefan Hajnoczi <[email protected]>
Fri, 5 Aug 2016 08:59:06 +0000 (09:59 +0100)
Before this patch incorrect image could be created via qemu-img
(Example: qemu-img create -f parallels -o size=4096T hack.img),
incorrect images cannot be used due to overflow in main image structure.

This patch add check of size in image creation.

After reading size it compare it with UINT32_MAX * cluster_size.

Signed-off-by: Klim Kireev <[email protected]>
Signed-off-by: Denis V. Lunev <[email protected]>
Message-id: 1469639300[email protected]
CC: Stefan Hajnoczi <[email protected]>
Signed-off-by: Stefan Hajnoczi <[email protected]>
block/parallels.c

index 807a80169fd611913aae9ce1ef0daa6cd958e495..2ccefa7d85c3bffd50ce7480458c47e711e05f59 100644 (file)
@@ -43,6 +43,7 @@
 #define HEADER_MAGIC2 "WithouFreSpacExt"
 #define HEADER_VERSION 2
 #define HEADER_INUSE_MAGIC  (0x746F6E59)
+#define MAX_PARALLELS_IMAGE_FACTOR (1ull << 32)
 
 #define DEFAULT_CLUSTER_SIZE 1048576        /* 1 MiB */
 
@@ -475,6 +476,10 @@ static int parallels_create(const char *filename, QemuOpts *opts, Error **errp)
                           BDRV_SECTOR_SIZE);
     cl_size = ROUND_UP(qemu_opt_get_size_del(opts, BLOCK_OPT_CLUSTER_SIZE,
                           DEFAULT_CLUSTER_SIZE), BDRV_SECTOR_SIZE);
+    if (total_size >= MAX_PARALLELS_IMAGE_FACTOR * cl_size) {
+        error_propagate(errp, local_err);
+        return -E2BIG;
+    }
 
     ret = bdrv_create_file(filename, opts, &local_err);
     if (ret < 0) {
This page took 0.033975 seconds and 4 git commands to generate.