[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 11/18] qcow2: check for NULL l2meta
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [PULL 11/18] qcow2: check for NULL l2meta |
Date: |
Sun, 9 Feb 2014 09:46:23 +0100 |
From: Hu Tao <address@hidden>
In the case of a metadata preallocation with a large cluster size,
qcow2_alloc_cluster_offset() can allocate nothing and returns a
NULL l2meta. This patch checks for it and link2 l2 with only valid
l2meta.
Replace 9 and 512 with BDRV_SECTOR_BITS, BDRV_SECTOR_SIZE
respectively while at the function.
Signed-off-by: Hu Tao <address@hidden>
Reviewed-by: Max Reitz <address@hidden>
Reviewed-by: Benoit Canet <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>
---
block/qcow2.c | 31 ++++++++++++++++---------------
1 file changed, 16 insertions(+), 15 deletions(-)
diff --git a/block/qcow2.c b/block/qcow2.c
index a274d5f..0b4335c 100644
--- a/block/qcow2.c
+++ b/block/qcow2.c
@@ -1404,34 +1404,34 @@ static int preallocate(BlockDriverState *bs)
int ret;
QCowL2Meta *meta;
- nb_sectors = bdrv_getlength(bs) >> 9;
+ nb_sectors = bdrv_getlength(bs) >> BDRV_SECTOR_BITS;
offset = 0;
while (nb_sectors) {
- num = MIN(nb_sectors, INT_MAX >> 9);
+ num = MIN(nb_sectors, INT_MAX >> BDRV_SECTOR_BITS);
ret = qcow2_alloc_cluster_offset(bs, offset, &num,
&host_offset, &meta);
if (ret < 0) {
return ret;
}
- ret = qcow2_alloc_cluster_link_l2(bs, meta);
- if (ret < 0) {
- qcow2_free_any_clusters(bs, meta->alloc_offset, meta->nb_clusters,
- QCOW2_DISCARD_NEVER);
- return ret;
- }
-
- /* There are no dependent requests, but we need to remove our request
- * from the list of in-flight requests */
if (meta != NULL) {
+ ret = qcow2_alloc_cluster_link_l2(bs, meta);
+ if (ret < 0) {
+ qcow2_free_any_clusters(bs, meta->alloc_offset,
+ meta->nb_clusters,
QCOW2_DISCARD_NEVER);
+ return ret;
+ }
+
+ /* There are no dependent requests, but we need to remove our
+ * request from the list of in-flight requests */
QLIST_REMOVE(meta, next_in_flight);
}
/* TODO Preallocate data if requested */
nb_sectors -= num;
- offset += num << 9;
+ offset += num << BDRV_SECTOR_BITS;
}
/*
@@ -1440,9 +1440,10 @@ static int preallocate(BlockDriverState *bs)
* EOF). Extend the image to the last allocated sector.
*/
if (host_offset != 0) {
- uint8_t buf[512];
- memset(buf, 0, 512);
- ret = bdrv_write(bs->file, (host_offset >> 9) + num - 1, buf, 1);
+ uint8_t buf[BDRV_SECTOR_SIZE];
+ memset(buf, 0, BDRV_SECTOR_SIZE);
+ ret = bdrv_write(bs->file, (host_offset >> BDRV_SECTOR_BITS) + num - 1,
+ buf, 1);
if (ret < 0) {
return ret;
}
--
1.8.1.4
- [Qemu-devel] [PULL 02/18] block: add native support for NFS, (continued)
- [Qemu-devel] [PULL 02/18] block: add native support for NFS, Kevin Wolf, 2014/02/09
- [Qemu-devel] [PULL 01/18] qemu-iotest: Make 077 raw-only, Kevin Wolf, 2014/02/09
- [Qemu-devel] [PULL 03/18] qemu-iotests: change _supported_proto to file for various tests, Kevin Wolf, 2014/02/09
- [Qemu-devel] [PULL 04/18] qemu-iotests: blacklist test 020 for NFS protocol, Kevin Wolf, 2014/02/09
- [Qemu-devel] [PULL 05/18] qemu-iotests: enable test 016 and 025 to work with NFS protocol, Kevin Wolf, 2014/02/09
- [Qemu-devel] [PULL 06/18] qemu-iotests: enable support for NFS protocol, Kevin Wolf, 2014/02/09
- [Qemu-devel] [PULL 08/18] block/iscsi: always fill bs->bl.opt_transfer_length, Kevin Wolf, 2014/02/09
- [Qemu-devel] [PULL 09/18] qcow2: remove n_start and n_end of qcow2_alloc_cluster_offset(), Kevin Wolf, 2014/02/09
- [Qemu-devel] [PULL 07/18] block: Fail gracefully with missing filename, Kevin Wolf, 2014/02/09
- [Qemu-devel] [PULL 10/18] qcow2: fix offset overflow in qcow2_alloc_clusters_at(), Kevin Wolf, 2014/02/09
- [Qemu-devel] [PULL 11/18] qcow2: check for NULL l2meta,
Kevin Wolf <=
- [Qemu-devel] [PULL 12/18] qemu-iotests: add test for qcow2 preallocation with different cluster sizes, Kevin Wolf, 2014/02/09
- [Qemu-devel] [PULL 13/18] raw: Fix BlockLimits passthrough, Kevin Wolf, 2014/02/09
- [Qemu-devel] [PULL 14/18] block: Fix memory leaks in bdrv_co_do_pwritev(), Kevin Wolf, 2014/02/09
- [Qemu-devel] [PULL 15/18] block: bdrv_aligned_pwritev: Assert overlap range, Kevin Wolf, 2014/02/09
- [Qemu-devel] [PULL 16/18] block: Don't call ROUND_UP with negative values, Kevin Wolf, 2014/02/09
- [Qemu-devel] [PULL 17/18] blkdebug: Don't leak bs->file on failure, Kevin Wolf, 2014/02/09
- [Qemu-devel] [PULL 18/18] block: Fix 32 bit truncation in mark_request_serialising(), Kevin Wolf, 2014/02/09
- Re: [Qemu-devel] [PULL 00/18] Block patches, Peter Maydell, 2014/02/12