[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PATCH v2 1/5] vpc: Check failure of bdrv_getlength()
From: |
Eric Blake |
Subject: |
[Qemu-block] [PATCH v2 1/5] vpc: Check failure of bdrv_getlength() |
Date: |
Wed, 9 Aug 2017 15:38:04 -0500 |
vpc_open() was checking for bdrv_getlength() failure in one, but
not the other, location.
Reported-by: Markus Armbruster <address@hidden>
Signed-off-by: Eric Blake <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Reviewed-by: Jeff Cody <address@hidden>
Reviewed-by: John Snow <address@hidden>
---
v2: error message tweak [Kevin]
---
block/vpc.c | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
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;
--
2.13.4
- [Qemu-block] [PATCH for-2.10 v2 0/5] More bdrv_getlength() fixes, Eric Blake, 2017/08/09
- [Qemu-block] [PATCH v2 1/5] vpc: Check failure of bdrv_getlength(),
Eric Blake <=
- [Qemu-block] [PATCH v2 3/5] qcow: Check failure of bdrv_getlength() and bdrv_truncate(), Eric Blake, 2017/08/09
- [Qemu-block] [PATCH v2 2/5] qcow: Change signature of get_cluster_offset(), Eric Blake, 2017/08/09
- [Qemu-block] [PATCH v2 4/5] qcow2: Drop debugging dump_refcounts(), Eric Blake, 2017/08/09
- [Qemu-block] [PATCH v2 5/5] qcow2: Check failure of bdrv_getlength(), Eric Blake, 2017/08/09
- Re: [Qemu-block] [PATCH for-2.10 v2 0/5] More bdrv_getlength() fixes, Kevin Wolf, 2017/08/10