diff options
| author | Eric Blake <eblake@redhat.com> | 2017-08-09 15:38:04 -0500 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2017-08-11 13:23:40 +0200 |
| commit | 81caa3cc3bdd9f5406130ee5bea94d5d7ee6e2e2 (patch) | |
| tree | 90a6f574ac5e26c41626e420a3fc5a7a9da212c3 /block/vpc.c | |
| parent | 01a02ec4f6b6a12df7acfb6ad820b384b48cbf70 (diff) | |
| download | qemu-81caa3cc3bdd9f5406130ee5bea94d5d7ee6e2e2.tar.gz | |
vpc: Check failure of bdrv_getlength()
vpc_open() was checking for bdrv_getlength() failure in one, but
not the other, location.
Reported-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Jeff Cody <jcody@redhat.com>
Reviewed-by: John Snow <jsnow@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'block/vpc.c')
| -rw-r--r-- | block/vpc.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/block/vpc.c b/block/vpc.c index 574879ba7c..82911ebead 100644 --- a/block/vpc.c +++ b/block/vpc.c @@ -219,6 +219,7 @@ static int vpc_open(BlockDriverState *bs, QDict *options, int flags, uint64_t pagetable_size; int disk_type = VHD_DYNAMIC; int ret; + int64_t bs_size; bs->file = bdrv_open_child(NULL, options, "file", bs, &child_file, false, errp); @@ -411,7 +412,13 @@ static int vpc_open(BlockDriverState *bs, QDict *options, int flags, } } - if (s->free_data_block_offset > bdrv_getlength(bs->file->bs)) { + bs_size = bdrv_getlength(bs->file->bs); + if (bs_size < 0) { + error_setg_errno(errp, -bs_size, "Unable to learn image size"); + ret = bs_size; + goto fail; + } + if (s->free_data_block_offset > bs_size) { error_setg(errp, "block-vpc: free_data_block_offset points after " "the end of file. The image has been truncated."); ret = -EINVAL; |