[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PULL 2/7] vpc: Check failure of bdrv_getlength()
From: |
Kevin Wolf |
Subject: |
[Qemu-block] [PULL 2/7] vpc: Check failure of bdrv_getlength() |
Date: |
Fri, 11 Aug 2017 16:05:31 +0200 |
From: Eric Blake <address@hidden>
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>
Signed-off-by: Kevin Wolf <address@hidden>
---
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] [PULL 0/7] Block/Multiboot patches for 2.10.0-rc3, Kevin Wolf, 2017/08/11
- [Qemu-block] [PULL 1/7] tests/multiboot: Fix whitespace failure, Kevin Wolf, 2017/08/11
- [Qemu-block] [PULL 2/7] vpc: Check failure of bdrv_getlength(),
Kevin Wolf <=
- [Qemu-block] [PULL 4/7] qcow2: Check failure of bdrv_getlength(), Kevin Wolf, 2017/08/11
- [Qemu-block] [PULL 5/7] osdep: Add runtime OFD lock detection, Kevin Wolf, 2017/08/11
- [Qemu-block] [PULL 3/7] qcow2: Drop debugging dump_refcounts(), Kevin Wolf, 2017/08/11
- [Qemu-block] [PULL 6/7] file-posix: Do runtime check for ofd lock API, Kevin Wolf, 2017/08/11
- [Qemu-block] [PULL 7/7] qemu-iotests: fix 185, Kevin Wolf, 2017/08/11
- Re: [Qemu-block] [PULL 0/7] Block/Multiboot patches for 2.10.0-rc3, Peter Maydell, 2017/08/11