mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

qcow2: Fix preallocation bdrv_pwrite to wrong file

Browse Source 
With an external data file, preallocate_co() must write the final byte
to the external data file, not to the qcow2 image file.

This is harmless for preallocation of newly created images (only the
qcow2 file size is increased to the virtual disk size while it should be
much smaller), but with preallocated resize, it could in theory cause
visible corruption if the metadata of the image is larger than the data
(e.g. lots of bitmaps).

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
This commit is contained in:
Kevin Wolf 2019-04-15 17:54:50 +02:00
parent a9b305ba29
commit 93e32b3e20
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
block/qcow2.c
View File

@ -2723,6 +2723,7 @@ static int qcow2_set_up_encryption(BlockDriverState *bs,
static int coroutine_fn preallocate_co(BlockDriverState *bs, uint64_t offset, static int coroutine_fn preallocate_co(BlockDriverState *bs, uint64_t offset,
uint64_t new_length) uint64_t new_length)
{ {
BDRVQcow2State *s = bs->opaque;
uint64_t bytes; uint64_t bytes;
uint64_t host_offset = 0; uint64_t host_offset = 0;
unsigned int cur_bytes; unsigned int cur_bytes;
@ -2771,7 +2772,7 @@ static int coroutine_fn preallocate_co(BlockDriverState *bs, uint64_t offset,
*/ */
if (host_offset != 0) { if (host_offset != 0) {
uint8_t data = 0; uint8_t data = 0;
ret = bdrv_pwrite(bs->file, (host_offset + cur_bytes) - 1, ret = bdrv_pwrite(s->data_file, (host_offset + cur_bytes) - 1,
&data, 1); &data, 1);
if (ret < 0) { if (ret < 0) {
return ret; return ret;