@@ -41,6 +41,7 @@
#define VMDK4_GD_AT_END 0xffffffffffffffffULL
#define VMDK_GTE_ZEROED 0x1
+#define VMDK_GRANULARITY_MAX 0x100000 /* limit of cluster_sectors */
/* VMDK internal error codes */
#define VMDK_OK 0
@@ -43,7 +43,7 @@ _supported_fmt vmdk
_supported_proto generic
_supported_os Linux
-granularity_offset=16
+granularity_offset=20
echo "=== Testing invalid granularity ==="
echo
@@ -1,2 +1,8 @@
QA output created by 059
+=== Testing invalid granularity ===
+
+Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
+invalid granularity, image may be corrupt
+qemu-io: can't open device TEST_DIR/t.vmdk
+no file open, try 'help open'
*** done
VMDK specification doesn't give upper limit of cluster size (header.grainSize). But we need to avoid unbounded memory allocation. Check the value when opening and refuse too big value (>512MB cluster size). Signed-off-by: Fam Zheng <famz@redhat.com> --- block/vmdk.c | 1 + tests/qemu-iotests/059 | 2 +- tests/qemu-iotests/059.out | 6 ++++++ 3 files changed, 8 insertions(+), 1 deletion(-)