cryptospore / rpms / qemu-kvm

Forked from rpms/qemu-kvm 2 years ago
Clone
218e99
From c85b3af7587973944c28b859dfefa91c21852971 Mon Sep 17 00:00:00 2001
218e99
From: Fam Zheng <famz@redhat.com>
218e99
Date: Tue, 6 Aug 2013 15:44:51 +0800
218e99
Subject: [PATCH 05/13] vmdk: check granularity field in opening
218e99
218e99
Message-id: <1377573001-27070-6-git-send-email-famz@redhat.com>
218e99
Patchwork-id: 53785
218e99
O-Subject: [RHEL-7 qemu-kvm PATCH 05/13] vmdk: check granularity field in opening
218e99
Bugzilla: 995866
218e99
RH-Acked-by: Paolo Bonzini <pbonzini@redhat.com>
218e99
RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
218e99
RH-Acked-by: Kevin Wolf <kwolf@redhat.com>
218e99
218e99
Granularity is used to calculate the cluster size and allocate r/w
218e99
buffer. Check the value from image before using it, so we don't abort()
218e99
for unbounded memory allocation.
218e99
218e99
Signed-off-by: Fam Zheng <famz@redhat.com>
218e99
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
218e99
(cherry picked from commit 8aa1331c09a9b899f48d97f097bb49b7d458be1c)
218e99
Signed-off-by: Fam Zheng <famz@redhat.com>
218e99
---
218e99
 block/vmdk.c               |   40 +++++++++++++++++++++++++++++++---------
218e99
 tests/qemu-iotests/059     |    8 +++++++-
218e99
 tests/qemu-iotests/059.out |    6 ++++++
218e99
 3 files changed, 44 insertions(+), 10 deletions(-)
218e99
218e99
diff --git a/block/vmdk.c b/block/vmdk.c
218e99
index 78ea480..8f59697 100644
218e99
--- a/block/vmdk.c
218e99
+++ b/block/vmdk.c
218e99
@@ -385,15 +385,22 @@ static int vmdk_parent_open(BlockDriverState *bs)
218e99
 
218e99
 /* Create and append extent to the extent array. Return the added VmdkExtent
218e99
  * address. return NULL if allocation failed. */
218e99
-static VmdkExtent *vmdk_add_extent(BlockDriverState *bs,
218e99
+static int vmdk_add_extent(BlockDriverState *bs,
218e99
                            BlockDriverState *file, bool flat, int64_t sectors,
218e99
                            int64_t l1_offset, int64_t l1_backup_offset,
218e99
                            uint32_t l1_size,
218e99
-                           int l2_size, unsigned int cluster_sectors)
218e99
+                           int l2_size, uint64_t cluster_sectors,
218e99
+                           VmdkExtent **new_extent)
218e99
 {
218e99
     VmdkExtent *extent;
218e99
     BDRVVmdkState *s = bs->opaque;
218e99
 
218e99
+    if (cluster_sectors > 0x200000) {
218e99
+        /* 0x200000 * 512Bytes = 1GB for one cluster is unrealistic */
218e99
+        error_report("invalid granularity, image may be corrupt");
218e99
+        return -EINVAL;
218e99
+    }
218e99
+
218e99
     s->extents = g_realloc(s->extents,
218e99
                               (s->num_extents + 1) * sizeof(VmdkExtent));
218e99
     extent = &s->extents[s->num_extents];
218e99
@@ -416,7 +423,10 @@ static VmdkExtent *vmdk_add_extent(BlockDriverState *bs,
218e99
         extent->end_sector = extent->sectors;
218e99
     }
218e99
     bs->total_sectors = extent->end_sector;
218e99
-    return extent;
218e99
+    if (new_extent) {
218e99
+        *new_extent = extent;
218e99
+    }
218e99
+    return 0;
218e99
 }
218e99
 
218e99
 static int vmdk_init_tables(BlockDriverState *bs, VmdkExtent *extent)
218e99
@@ -475,12 +485,17 @@ static int vmdk_open_vmdk3(BlockDriverState *bs,
218e99
     if (ret < 0) {
218e99
         return ret;
218e99
     }
218e99
-    extent = vmdk_add_extent(bs,
218e99
+
218e99
+    ret = vmdk_add_extent(bs,
218e99
                              bs->file, false,
218e99
                              le32_to_cpu(header.disk_sectors),
218e99
                              le32_to_cpu(header.l1dir_offset) << 9,
218e99
                              0, 1 << 6, 1 << 9,
218e99
-                             le32_to_cpu(header.granularity));
218e99
+                             le32_to_cpu(header.granularity),
218e99
+                             &extent);
218e99
+    if (ret < 0) {
218e99
+        return ret;
218e99
+    }
218e99
     ret = vmdk_init_tables(bs, extent);
218e99
     if (ret) {
218e99
         /* free extent allocated by vmdk_add_extent */
218e99
@@ -580,13 +595,17 @@ static int vmdk_open_vmdk4(BlockDriverState *bs,
218e99
     if (le32_to_cpu(header.flags) & VMDK4_FLAG_RGD) {
218e99
         l1_backup_offset = le64_to_cpu(header.rgd_offset) << 9;
218e99
     }
218e99
-    extent = vmdk_add_extent(bs, file, false,
218e99
+    ret = vmdk_add_extent(bs, file, false,
218e99
                           le64_to_cpu(header.capacity),
218e99
                           le64_to_cpu(header.gd_offset) << 9,
218e99
                           l1_backup_offset,
218e99
                           l1_size,
218e99
                           le32_to_cpu(header.num_gtes_per_gte),
218e99
-                          le64_to_cpu(header.granularity));
218e99
+                          le64_to_cpu(header.granularity),
218e99
+                          &extent);
218e99
+    if (ret < 0) {
218e99
+        return ret;
218e99
+    }
218e99
     extent->compressed =
218e99
         le16_to_cpu(header.compressAlgorithm) == VMDK4_COMPRESSION_DEFLATE;
218e99
     extent->has_marker = le32_to_cpu(header.flags) & VMDK4_FLAG_MARKER;
218e99
@@ -702,8 +721,11 @@ static int vmdk_parse_extents(const char *desc, BlockDriverState *bs,
218e99
             /* FLAT extent */
218e99
             VmdkExtent *extent;
218e99
 
218e99
-            extent = vmdk_add_extent(bs, extent_file, true, sectors,
218e99
-                            0, 0, 0, 0, sectors);
218e99
+            ret = vmdk_add_extent(bs, extent_file, true, sectors,
218e99
+                            0, 0, 0, 0, sectors, &extent);
218e99
+            if (ret < 0) {
218e99
+                return ret;
218e99
+            }
218e99
             extent->flat_start_offset = flat_offset << 9;
218e99
         } else if (!strcmp(type, "SPARSE")) {
218e99
             /* SPARSE extent */
218e99
diff --git a/tests/qemu-iotests/059 b/tests/qemu-iotests/059
218e99
index 9dc7f64..9545e82 100755
218e99
--- a/tests/qemu-iotests/059
218e99
+++ b/tests/qemu-iotests/059
218e99
@@ -43,7 +43,13 @@ _supported_fmt vmdk
218e99
 _supported_proto generic
218e99
 _supported_os Linux
218e99
 
218e99
-granularity_offset=16
218e99
+granularity_offset=20
218e99
+
218e99
+echo "=== Testing invalid granularity ==="
218e99
+echo
218e99
+_make_test_img 64M
218e99
+poke_file "$TEST_IMG" "$granularity_offset" "\xff\xff\xff\xff\xff\xff\xff\xff"
218e99
+{ $QEMU_IO -c "read 0 512" $TEST_IMG; } 2>&1 | _filter_qemu_io | _filter_testdir
218e99
 
218e99
 # success, all done
218e99
 echo "*** done"
218e99
diff --git a/tests/qemu-iotests/059.out b/tests/qemu-iotests/059.out
218e99
index 4ca7f29..380ca3d 100644
218e99
--- a/tests/qemu-iotests/059.out
218e99
+++ b/tests/qemu-iotests/059.out
218e99
@@ -1,2 +1,8 @@
218e99
 QA output created by 059
218e99
+=== Testing invalid granularity ===
218e99
+
218e99
+Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
218e99
+invalid granularity, image may be corrupt
218e99
+qemu-io: can't open device TEST_DIR/t.vmdk
218e99
+no file open, try 'help open'
218e99
 *** done
218e99
-- 
218e99
1.7.1
218e99