diff options
| author | Alberto Garcia <berto@igalia.com> | 2020-01-18 20:09:27 +0100 |
|---|---|---|
| committer | Max Reitz <mreitz@redhat.com> | 2020-02-06 13:47:45 +0100 |
| commit | 344ffea951aa4aa4259f24c885ba00e768083f09 (patch) | |
| tree | 6a6f9737bedc2a7b618a79ec4ae238a01aab178f /block/qcow2.c | |
| parent | ef97d608c7f069331d8141d1d59df715f4a3beaf (diff) | |
| download | qemu-344ffea951aa4aa4259f24c885ba00e768083f09.zip qemu-344ffea951aa4aa4259f24c885ba00e768083f09.tar.gz qemu-344ffea951aa4aa4259f24c885ba00e768083f09.tar.bz2 | |
qcow2: Tighten cluster_offset alignment assertions
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 <berto@igalia.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
Message-id: 558ba339965f858bede4c73ce3f50f0c0493597d.1579374329.git.berto@igalia.com
Signed-off-by: Max Reitz <mreitz@redhat.com>
Diffstat (limited to 'block/qcow2.c')
| -rw-r--r-- | block/qcow2.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/block/qcow2.c b/block/qcow2.c index 83db013..6cb5aee 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); |