diff options
author | Kevin Wolf <kwolf@redhat.com> | 2014-11-20 16:27:11 +0100 |
---|---|---|
committer | Kevin Wolf <kwolf@redhat.com> | 2014-12-10 10:31:12 +0100 |
commit | 7cddd3728e964164e99c59e5c9443508d9ee0161 (patch) | |
tree | fec4adc1f623e1b87851c59a819af623b2342664 /block.c | |
parent | c6684249fd35f7e692bcf3039d2fc4b13dd32308 (diff) |
block: Read only one sector for format probing
The only image format driver that even potentially accesses anything
after 512 bytes in its bdrv_probe() implementation is VMDK, which reads
a plain-text descriptor file. In practice, the field it's looking for
seems to come first and will be well within the first 512 bytes, too.
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
Message-id: 1416497234-29880-7-git-send-email-kwolf@redhat.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'block.c')
-rw-r--r-- | block.c | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -654,8 +654,8 @@ BlockDriver *bdrv_find_protocol(const char *filename, * we do it anyway for backward compatibility. * * @buf contains the image's first @buf_size bytes. - * @buf_size is the buffer size in bytes (generally 2048, but can be smaller - * if the image file is smaller) + * @buf_size is the buffer size in bytes (generally BLOCK_PROBE_BUF_SIZE, + * but can be smaller if the image file is smaller) * @filename is its filename. * * For all block drivers, call the bdrv_probe() method to get its @@ -685,7 +685,7 @@ static int find_image_format(BlockDriverState *bs, const char *filename, BlockDriver **pdrv, Error **errp) { BlockDriver *drv; - uint8_t buf[2048]; + uint8_t buf[BLOCK_PROBE_BUF_SIZE]; int ret = 0; /* Return the raw BlockDriver * to scsi-generic devices or empty drives */ |