]> git.proxmox.com Git - mirror_qemu.git/commit - qemu-img.c
block: update string sizes for filename,backing_file,exact_filename
authorJeff Cody <jcody@redhat.com>
Thu, 22 Jan 2015 13:03:30 +0000 (08:03 -0500)
committerKevin Wolf <kwolf@redhat.com>
Fri, 23 Jan 2015 17:17:06 +0000 (18:17 +0100)
commit9a29e18f7dfd5a0e80d1c60fc856ebba18ddb738
treee9c2bf9ca98de347124834109e8bdee2b3859004
parent1d33936ea847693a6d69f9049691a0341d6e0b9f
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>
block/qapi.c
block/qcow.c
block/qcow2.c
block/vvfat.c
include/block/block_int.h
qemu-img.c