[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 02/19] vmdk: Fix error for JSON descriptor file names
From: |
Stefan Hajnoczi |
Subject: |
[Qemu-devel] [PULL 02/19] vmdk: Fix error for JSON descriptor file names |
Date: |
Fri, 12 Dec 2014 17:09:48 +0000 |
From: Max Reitz <address@hidden>
If vmdk blindly tries to use path_combine() using bs->file->filename as
the base file name, this will result in a bad error message for JSON
file names when calling bdrv_open(). It is better to only try
bs->file->exact_filename; if that is empty, bs->file->filename will be
useless for path_combine() and an error should be emitted (containing
bs->file->filename because desc_file_path (which is
bs->file->exact_filename) is empty).
Signed-off-by: Max Reitz <address@hidden>
Reviewed-by: Fam Zheng <address@hidden>
Message-id: address@hidden
Signed-off-by: Stefan Hajnoczi <address@hidden>
---
block.c | 2 +-
block/vmdk.c | 10 +++++++++-
include/block/block.h | 1 +
3 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/block.c b/block.c
index 82f33c5..a75a992 100644
--- a/block.c
+++ b/block.c
@@ -229,7 +229,7 @@ size_t bdrv_opt_mem_align(BlockDriverState *bs)
}
/* check if the path starts with "<protocol>:" */
-static int path_has_protocol(const char *path)
+int path_has_protocol(const char *path)
{
const char *p;
diff --git a/block/vmdk.c b/block/vmdk.c
index 65af414..bfff900 100644
--- a/block/vmdk.c
+++ b/block/vmdk.c
@@ -833,6 +833,14 @@ static int vmdk_parse_extents(const char *desc,
BlockDriverState *bs,
goto next_line;
}
+ if (!path_is_absolute(fname) && !path_has_protocol(fname) &&
+ !desc_file_path[0])
+ {
+ error_setg(errp, "Cannot use relative extent paths with VMDK "
+ "descriptor file '%s'", bs->file->filename);
+ return -EINVAL;
+ }
+
path_combine(extent_path, sizeof(extent_path),
desc_file_path, fname);
extent_file = NULL;
@@ -909,7 +917,7 @@ static int vmdk_open_desc_file(BlockDriverState *bs, int
flags, char *buf,
}
s->create_type = g_strdup(ct);
s->desc_offset = 0;
- ret = vmdk_parse_extents(buf, bs, bs->file->filename, errp);
+ ret = vmdk_parse_extents(buf, bs, bs->file->exact_filename, errp);
exit:
return ret;
}
diff --git a/include/block/block.h b/include/block/block.h
index 610be9f..919c8f5 100644
--- a/include/block/block.h
+++ b/include/block/block.h
@@ -401,6 +401,7 @@ void bdrv_get_full_backing_filename(BlockDriverState *bs,
char *dest, size_t sz);
int bdrv_is_snapshot(BlockDriverState *bs);
+int path_has_protocol(const char *path);
int path_is_absolute(const char *path);
void path_combine(char *dest, int dest_size,
const char *base_path,
--
2.1.0
- [Qemu-devel] [PULL 00/19] Block patches, Stefan Hajnoczi, 2014/12/12
- [Qemu-devel] [PULL 01/19] block migration: fix return value, Stefan Hajnoczi, 2014/12/12
- [Qemu-devel] [PULL 02/19] vmdk: Fix error for JSON descriptor file names,
Stefan Hajnoczi <=
- [Qemu-devel] [PULL 03/19] iotests: Add test for vmdk JSON file names, Stefan Hajnoczi, 2014/12/12
- [Qemu-devel] [PULL 04/19] block/rbd: fix memory leak, Stefan Hajnoczi, 2014/12/12
- [Qemu-devel] [PULL 05/19] block: vhdx - remove redundant comments, Stefan Hajnoczi, 2014/12/12
- [Qemu-devel] [PULL 06/19] block: vhdx - update PAYLOAD_BLOCK_UNMAPPED value to match 1.00 spec, Stefan Hajnoczi, 2014/12/12
- [Qemu-devel] [PULL 07/19] block: vhdx - change .vhdx_create default block state to ZERO, Stefan Hajnoczi, 2014/12/12
- [Qemu-devel] [PULL 08/19] qemu-io: Add sigraise command, Stefan Hajnoczi, 2014/12/12
- [Qemu-devel] [PULL 09/19] iotests: Filter for "Killed" in qemu-io output, Stefan Hajnoczi, 2014/12/12
- [Qemu-devel] [PULL 10/19] iotests: Fix test 039, Stefan Hajnoczi, 2014/12/12
- [Qemu-devel] [PULL 11/19] block: vhdx - set .bdrv_has_zero_init to bdrv_has_zero_init_1, Stefan Hajnoczi, 2014/12/12
- [Qemu-devel] [PULL 13/19] block: Don't add trailing space in "Formating..." message, Stefan Hajnoczi, 2014/12/12