Message ID | 1382598963-9264-1-git-send-email-pl@kamp.de |
---|---|
State | New |
Headers | show |
On 10/24/2013 08:16 AM, Peter Lieven wrote: > this adds a check that a dynamic VHD file has not been > accidently truncated (e.g. during transfer or upload). > > Signed-off-by: Peter Lieven <pl@kamp.de> > --- > v1->v2: used the errp argument as Eric suggested > > block/vpc.c | 7 +++++++ > 1 file changed, 7 insertions(+) Reviewed-by: Eric Blake <eblake@redhat.com>
Am 24.10.2013 um 09:16 hat Peter Lieven geschrieben: > this adds a check that a dynamic VHD file has not been > accidently truncated (e.g. during transfer or upload). > > Signed-off-by: Peter Lieven <pl@kamp.de> Thanks, applied to the block branch. Kevin
On 24.10.2013 12:06, Kevin Wolf wrote: > Am 24.10.2013 um 09:16 hat Peter Lieven geschrieben: >> this adds a check that a dynamic VHD file has not been >> accidently truncated (e.g. during transfer or upload). >> >> Signed-off-by: Peter Lieven <pl@kamp.de> > Thanks, applied to the block branch. Can you have a look at: block/vpc: fix virtual size for images created with disk2vhd as well please. Peter
diff --git a/block/vpc.c b/block/vpc.c index b5dca39..627d11c 100644 --- a/block/vpc.c +++ b/block/vpc.c @@ -260,6 +260,13 @@ static int vpc_open(BlockDriverState *bs, QDict *options, int flags, } } + if (s->free_data_block_offset > bdrv_getlength(bs->file)) { + error_setg(errp, "block-vpc: free_data_block_offset points after " + "the end of file. The image has been truncated."); + ret = -EINVAL; + goto fail; + } + s->last_bitmap_offset = (int64_t) -1; #ifdef CACHE
this adds a check that a dynamic VHD file has not been accidently truncated (e.g. during transfer or upload). Signed-off-by: Peter Lieven <pl@kamp.de> --- v1->v2: used the errp argument as Eric suggested block/vpc.c | 7 +++++++ 1 file changed, 7 insertions(+)