[Qemu-devel] [PATCHv2] block/vpc: check that the image has not been truncated

[Qemu-devel] [PATCHv2] block/vpc: check that the image has not been truncated

[Peter Lieven]

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(+)

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
-- 
1.7.9.5

Re: [Qemu-devel] [PATCHv2] block/vpc: check that the image has not been truncated

[Eric Blake]

[-- Attachment #1: Type: text/plain, Size: 497 bytes --]

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>

-- 
Eric Blake   eblake redhat com    +1-919-301-3266
Libvirt virtualization library http://libvirt.org


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 621 bytes --]

Re: [Qemu-devel] [PATCHv2] block/vpc: check that the image has not been truncated

[Kevin Wolf]

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

Re: [Qemu-devel] [PATCHv2] block/vpc: check that the image has not been truncated

[Peter Lieven]

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