diff options
| author | Fam Zheng <famz@redhat.com> | 2014-01-21 15:07:43 +0800 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2014-01-24 14:33:00 +0100 |
| commit | 34ceed81f9ca31829448276dafe3d9151d66962c (patch) | |
| tree | ec261752eeef0b69139325ebfe4149435c0d7f8b | |
| parent | 46bae927134468d27f5e2508c3ced67ff58fa45b (diff) | |
| download | focaccia-qemu-34ceed81f9ca31829448276dafe3d9151d66962c.tar.gz focaccia-qemu-34ceed81f9ca31829448276dafe3d9151d66962c.zip | |
vmdk: Check for overhead when opening
Report an error if file size is even smaller than metadata. Signed-off-by: Fam Zheng <famz@redhat.com> Signed-off-by: Kevin Wolf <kwolf@redhat.com>
| -rw-r--r-- | block/vmdk.c | 7 | ||||
| -rwxr-xr-x | tests/qemu-iotests/059 | 6 | ||||
| -rw-r--r-- | tests/qemu-iotests/059.out | 5 |
3 files changed, 18 insertions, 0 deletions
diff --git a/block/vmdk.c b/block/vmdk.c index 599a928545..74c44bd5fb 100644 --- a/block/vmdk.c +++ b/block/vmdk.c @@ -640,6 +640,13 @@ static int vmdk_open_vmdk4(BlockDriverState *bs, if (le32_to_cpu(header.flags) & VMDK4_FLAG_RGD) { l1_backup_offset = le64_to_cpu(header.rgd_offset) << 9; } + if (bdrv_getlength(file) < + le64_to_cpu(header.grain_offset) * BDRV_SECTOR_SIZE) { + error_report("File truncated, expecting at least %lld bytes", + le64_to_cpu(header.grain_offset) * BDRV_SECTOR_SIZE); + return -EINVAL; + } + ret = vmdk_add_extent(bs, file, false, le64_to_cpu(header.capacity), le64_to_cpu(header.gd_offset) << 9, diff --git a/tests/qemu-iotests/059 b/tests/qemu-iotests/059 index 64ed04cfce..2d604d3a91 100755 --- a/tests/qemu-iotests/059 +++ b/tests/qemu-iotests/059 @@ -98,6 +98,12 @@ EOF _img_info echo +echo "=== Testing truncated sparse ===" +IMGOPTS="subformat=monolithicSparse" _make_test_img 100G +truncate -s 10M $TEST_IMG +_img_info + +echo echo "=== Testing version 3 ===" _use_sample_img iotest-version3.vmdk.bz2 _img_info diff --git a/tests/qemu-iotests/059.out b/tests/qemu-iotests/059.out index 5e30e69bef..4ffeb54710 100644 --- a/tests/qemu-iotests/059.out +++ b/tests/qemu-iotests/059.out @@ -2043,6 +2043,11 @@ qemu-img: Could not open 'TEST_DIR/t.IMGFMT': Invalid extent lines: RW 12582912 VMFS "dummy.IMGFMT" 1 +=== Testing truncated sparse === +Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=107374182400 +qemu-img: File truncated, expecting at least 13172736 bytes +qemu-img: Could not open 'TEST_DIR/t.IMGFMT': Could not open 'TEST_DIR/t.IMGFMT': Wrong medium type + === Testing version 3 === image: TEST_DIR/iotest-version3.IMGFMT file format: IMGFMT |