[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 7/7] vmdk: Allow reading variable size descriptor fil
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [PULL 7/7] vmdk: Allow reading variable size descriptor files |
Date: |
Mon, 17 Jun 2013 18:31:50 +0200 |
From: Evgeny Budilovsky <address@hidden>
the hard-coded 2k buffer on the stack won't allow reading big descriptor
files which can be generated when storing big images. For example 500G
vmdk splitted to 2G chunks.
Signed-off-by: Evgeny Budilovsky <address@hidden>
Reviewed-by: Stefan Hajnoczi <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>
---
block/vmdk.c | 27 ++++++++++++++++++++-------
1 file changed, 20 insertions(+), 7 deletions(-)
diff --git a/block/vmdk.c b/block/vmdk.c
index ee50a73..65ae011 100644
--- a/block/vmdk.c
+++ b/block/vmdk.c
@@ -722,27 +722,40 @@ static int vmdk_open_desc_file(BlockDriverState *bs, int
flags,
int64_t desc_offset)
{
int ret;
- char buf[2048];
+ char *buf = NULL;
char ct[128];
BDRVVmdkState *s = bs->opaque;
+ int64_t size;
- ret = bdrv_pread(bs->file, desc_offset, buf, sizeof(buf));
+ size = bdrv_getlength(bs->file);
+ if (size < 0) {
+ return -EINVAL;
+ }
+
+ size = MIN(size, 1 << 20); /* avoid unbounded allocation */
+ buf = g_malloc0(size + 1);
+
+ ret = bdrv_pread(bs->file, desc_offset, buf, size);
if (ret < 0) {
- return ret;
+ goto exit;
}
- buf[2047] = '\0';
if (vmdk_parse_description(buf, "createType", ct, sizeof(ct))) {
- return -EMEDIUMTYPE;
+ ret = -EMEDIUMTYPE;
+ goto exit;
}
if (strcmp(ct, "monolithicFlat") &&
strcmp(ct, "twoGbMaxExtentSparse") &&
strcmp(ct, "twoGbMaxExtentFlat")) {
fprintf(stderr,
"VMDK: Not supported image type \"%s\""".\n", ct);
- return -ENOTSUP;
+ ret = -ENOTSUP;
+ goto exit;
}
s->desc_offset = 0;
- return vmdk_parse_extents(buf, bs, bs->file->filename);
+ ret = vmdk_parse_extents(buf, bs, bs->file->filename);
+exit:
+ g_free(buf);
+ return ret;
}
static int vmdk_open(BlockDriverState *bs, QDict *options, int flags)
--
1.8.1.4
- [Qemu-devel] [PULL 0/7] Block patches, Kevin Wolf, 2013/06/17
- [Qemu-devel] [PULL 2/7] sheepdog: support 'qemu-img snapshot -a', Kevin Wolf, 2013/06/17
- [Qemu-devel] [PULL 1/7] sheepdog: fix snapshot tag initialization, Kevin Wolf, 2013/06/17
- [Qemu-devel] [PULL 4/7] vmdk: byteswap VMDK4Header.desc_offset field, Kevin Wolf, 2013/06/17
- [Qemu-devel] [PULL 5/7] curl: Don't set curl options on the handle just before it's going to be deleted., Kevin Wolf, 2013/06/17
- [Qemu-devel] [PULL 3/7] block/curl.c: Refuse to open the handle for writes., Kevin Wolf, 2013/06/17
- [Qemu-devel] [PULL 7/7] vmdk: Allow reading variable size descriptor files,
Kevin Wolf <=
- [Qemu-devel] [PULL 6/7] NVMe: Initial commit for new storage interface, Kevin Wolf, 2013/06/17
- Re: [Qemu-devel] [PULL 0/7] Block patches, Anthony Liguori, 2013/06/17