diff options
author | Jeff Cody <jcody@redhat.com> | 2015-01-22 08:03:30 -0500 |
---|---|---|
committer | Kevin Wolf <kwolf@redhat.com> | 2015-01-23 18:17:06 +0100 |
commit | 9a29e18f7dfd5a0e80d1c60fc856ebba18ddb738 (patch) | |
tree | e9c2bf9ca98de347124834109e8bdee2b3859004 /block/qapi.c | |
parent | 1d33936ea847693a6d69f9049691a0341d6e0b9f (diff) | |
download | qemu-9a29e18f7dfd5a0e80d1c60fc856ebba18ddb738.tar.gz qemu-9a29e18f7dfd5a0e80d1c60fc856ebba18ddb738.tar.bz2 qemu-9a29e18f7dfd5a0e80d1c60fc856ebba18ddb738.zip |
block: update string sizes for filename,backing_file,exact_filename
The string field entries 'filename', 'backing_file', and
'exact_filename' in the BlockDriverState struct are defined as 1024
bytes.
However, many places that use these values accept a maximum of PATH_MAX
bytes, so we have a mixture of 1024 byte and PATH_MAX byte allocations.
This patch makes the BlockDriverStruct field string sizes match usage.
This patch also does a few fixes related to the size that needs to
happen now:
* the block qapi driver is updated to use PATH_MAX bytes
* the qcow and qcow2 drivers have an additional safety check
* the block vvfat driver is updated to use PATH_MAX bytes
for the size of backing_file, for systems where PATH_MAX is < 1024
bytes.
* qemu-img uses PATH_MAX rather than 1024. These instances were not
changed to be dynamically allocated, however, as the extra
temporary 3K in stack usage for qemu-img does not seem worrisome.
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: John Snow <jsnow@redhat.com>
Signed-off-by: Jeff Cody <jcody@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'block/qapi.c')
-rw-r--r-- | block/qapi.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/block/qapi.c b/block/qapi.c index dec9f60d10..75c388e90b 100644 --- a/block/qapi.c +++ b/block/qapi.c @@ -210,10 +210,10 @@ void bdrv_query_image_info(BlockDriverState *bs, backing_filename = bs->backing_file; if (backing_filename[0] != '\0') { - char *backing_filename2 = g_malloc0(1024); + char *backing_filename2 = g_malloc0(PATH_MAX); info->backing_filename = g_strdup(backing_filename); info->has_backing_filename = true; - bdrv_get_full_backing_filename(bs, backing_filename2, 1024, &err); + bdrv_get_full_backing_filename(bs, backing_filename2, PATH_MAX, &err); if (err) { error_propagate(errp, err); qapi_free_ImageInfo(info); |