[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PATCH v2 5/5] qcow2: Check failure of bdrv_getlength()
From: |
Eric Blake |
Subject: |
[Qemu-block] [PATCH v2 5/5] qcow2: Check failure of bdrv_getlength() |
Date: |
Wed, 9 Aug 2017 15:38:08 -0500 |
qcow2_co_pwritev_compressed() should not call bdrv_truncate()
if determining the size failed.
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: Kevin Wolf <address@hidden>
Reviewed-by: John Snow <address@hidden>
---
block/qcow2.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/block/qcow2.c b/block/qcow2.c
index 99407403ea..40ba26c111 100644
--- a/block/qcow2.c
+++ b/block/qcow2.c
@@ -3282,12 +3282,15 @@ qcow2_co_pwritev_compressed(BlockDriverState *bs,
uint64_t offset,
z_stream strm;
int ret, out_len;
uint8_t *buf, *out_buf;
- uint64_t cluster_offset;
+ int64_t cluster_offset;
if (bytes == 0) {
/* align end of file to a sector boundary to ease reading with
sector based I/Os */
cluster_offset = bdrv_getlength(bs->file->bs);
+ if (cluster_offset < 0) {
+ return cluster_offset;
+ }
return bdrv_truncate(bs->file, cluster_offset, PREALLOC_MODE_OFF,
NULL);
}
--
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, 2017/08/09
- [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 <=
- Re: [Qemu-block] [PATCH for-2.10 v2 0/5] More bdrv_getlength() fixes, Kevin Wolf, 2017/08/10