[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 12/17] qcow2: Tighten cluster_offset alignment assertions
From: |
Max Reitz |
Subject: |
[PULL 12/17] qcow2: Tighten cluster_offset alignment assertions |
Date: |
Thu, 6 Feb 2020 13:51:27 +0100 |
From: Alberto Garcia <address@hidden>
qcow2_alloc_cluster_offset() and qcow2_get_cluster_offset() always
return offsets that are cluster-aligned so don't just check that they
are sector-aligned.
The check in qcow2_co_preadv_task() is also replaced by an assertion
for the same reason.
Signed-off-by: Alberto Garcia <address@hidden>
Reviewed-by: Max Reitz <address@hidden>
Message-id: address@hidden
Signed-off-by: Max Reitz <address@hidden>
---
block/qcow2.c | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/block/qcow2.c b/block/qcow2.c
index 83db013814..6cb5aee4a5 100644
--- a/block/qcow2.c
+++ b/block/qcow2.c
@@ -2167,10 +2167,7 @@ static coroutine_fn int
qcow2_co_preadv_task(BlockDriverState *bs,
offset, bytes, qiov, qiov_offset);
case QCOW2_CLUSTER_NORMAL:
- if ((file_cluster_offset & 511) != 0) {
- return -EIO;
- }
-
+ assert(offset_into_cluster(s, file_cluster_offset) == 0);
if (bs->encrypted) {
return qcow2_co_preadv_encrypted(bs, file_cluster_offset,
offset, bytes, qiov, qiov_offset);
@@ -2506,7 +2503,7 @@ static coroutine_fn int qcow2_co_pwritev_part(
goto out_locked;
}
- assert((cluster_offset & 511) == 0);
+ assert(offset_into_cluster(s, cluster_offset) == 0);
ret = qcow2_pre_write_overlap_check(bs, 0,
cluster_offset + offset_in_cluster,
@@ -3896,7 +3893,7 @@ qcow2_co_copy_range_to(BlockDriverState *bs,
goto fail;
}
- assert((cluster_offset & 511) == 0);
+ assert(offset_into_cluster(s, cluster_offset) == 0);
ret = qcow2_pre_write_overlap_check(bs, 0,
cluster_offset + offset_in_cluster, cur_bytes, true);
--
2.24.1
- [PULL 01/17] qcow2: Assert that host cluster offsets fit in L2 table entries, (continued)
- [PULL 01/17] qcow2: Assert that host cluster offsets fit in L2 table entries, Max Reitz, 2020/02/06
- [PULL 02/17] block: Use a GString in bdrv_perm_names(), Max Reitz, 2020/02/06
- [PULL 03/17] block: fix memleaks in bdrv_refresh_filename, Max Reitz, 2020/02/06
- [PULL 04/17] qcow2: Use a GString in report_unsupported_feature(), Max Reitz, 2020/02/06
- [PULL 05/17] iotests: remove 'linux' from default supported platforms, Max Reitz, 2020/02/06
- [PULL 06/17] iotests: Test 041 only works on certain systems, Max Reitz, 2020/02/06
- [PULL 07/17] iotests: Test 183 does not work on macOS and OpenBSD, Max Reitz, 2020/02/06
- [PULL 09/17] iotests: Skip Python-based tests if QEMU does not support virtio-blk, Max Reitz, 2020/02/06
- [PULL 08/17] iotests: Check for the availability of the required devices in 267 and 127, Max Reitz, 2020/02/06
- [PULL 10/17] iotests: Enable more tests in the 'auto' group to improve test coverage, Max Reitz, 2020/02/06
- [PULL 12/17] qcow2: Tighten cluster_offset alignment assertions,
Max Reitz <=
- [PULL 11/17] qcow2: Don't round the L1 table allocation up to the sector size, Max Reitz, 2020/02/06
- [PULL 13/17] qcow2: Use bs->bl.request_alignment when updating an L1 entry, Max Reitz, 2020/02/06
- [PULL 14/17] qcow2: Don't require aligned offsets in qcow2_co_copy_range_from(), Max Reitz, 2020/02/06
- [PULL 15/17] qcow2: Use BDRV_SECTOR_SIZE instead of the hardcoded value, Max Reitz, 2020/02/06
- [PULL 16/17] block/backup-top: fix failure path, Max Reitz, 2020/02/06
- [PULL 17/17] iotests: add test for backup-top failure on permission activation, Max Reitz, 2020/02/06
- Re: [PULL 00/17] Block patches, Peter Maydell, 2020/02/06