[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v4 4/6] vmdk: Check descriptor file length when read
From: |
Fam Zheng |
Subject: |
[Qemu-devel] [PATCH v4 4/6] vmdk: Check descriptor file length when reading it |
Date: |
Thu, 4 Dec 2014 07:28:32 +0800 |
Since a too small file cannot be a valid VMDK image, and also since the
buffer's first 4 bytes will be unconditionally examined by
vmdk_open_sparse, let's error out the small file case to be clear.
Signed-off-by: Fam Zheng <address@hidden>
---
block/vmdk.c | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/block/vmdk.c b/block/vmdk.c
index 5f43226..b703395 100644
--- a/block/vmdk.c
+++ b/block/vmdk.c
@@ -557,6 +557,14 @@ static char *vmdk_read_desc(BlockDriverState *file,
uint64_t desc_offset,
return NULL;
}
+ if (size < 4) {
+ /* Both descriptor file and sparse image must be much larger than 4
+ * bytes, also callers of vmdk_read_desc want to compare the first 4
+ * bytes with VMDK4_MAGIC, let's error out if less is read. */
+ error_setg(errp, "File is too small, not a valid image");
+ return NULL;
+ }
+
size = MIN(size, (1 << 20) - 1); /* avoid unbounded allocation */
buf = g_malloc(size + 1);
--
1.9.3
- [Qemu-devel] [PATCH v4 0/6] vmdk: A few small fixes, Fam Zheng, 2014/12/03
- [Qemu-devel] [PATCH v4 1/6] vmdk: Use g_random_int to generate CID, Fam Zheng, 2014/12/03
- [Qemu-devel] [PATCH v4 3/6] vmdk: Clean up descriptor file reading, Fam Zheng, 2014/12/03
- [Qemu-devel] [PATCH v4 2/6] vmdk: Fix comment to match code of extent lines, Fam Zheng, 2014/12/03
- [Qemu-devel] [PATCH v4 5/6] vmdk: Remove unnecessary initialization, Fam Zheng, 2014/12/03
- [Qemu-devel] [PATCH v4 6/6] vmdk: Set errp on failures in vmdk_open_vmdk4, Fam Zheng, 2014/12/03
- [Qemu-devel] [PATCH v4 4/6] vmdk: Check descriptor file length when reading it,
Fam Zheng <=
- Re: [Qemu-devel] [PATCH v4 0/6] vmdk: A few small fixes, Max Reitz, 2014/12/04