[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v13 02/15] block/backup: fix backup_cow_with_offload for last clu
From: |
Vladimir Sementsov-Ogievskiy |
Subject: |
[PATCH v13 02/15] block/backup: fix backup_cow_with_offload for last cluster |
Date: |
Fri, 20 Sep 2019 17:20:43 +0300 |
We shouldn't try to copy bytes beyond EOF. Fix it.
Fixes: 9ded4a0114968e
Signed-off-by: Vladimir Sementsov-Ogievskiy <address@hidden>
Reviewed-by: Max Reitz <address@hidden>
Reviewed-by: John Snow <address@hidden>
---
block/backup.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/block/backup.c b/block/backup.c
index db20249063..99177f03f8 100644
--- a/block/backup.c
+++ b/block/backup.c
@@ -161,7 +161,7 @@ static int coroutine_fn
backup_cow_with_offload(BackupBlockJob *job,
assert(QEMU_IS_ALIGNED(job->copy_range_size, job->cluster_size));
assert(QEMU_IS_ALIGNED(start, job->cluster_size));
- nbytes = MIN(job->copy_range_size, end - start);
+ nbytes = MIN(job->copy_range_size, MIN(end, job->len) - start);
nr_clusters = DIV_ROUND_UP(nbytes, job->cluster_size);
bdrv_reset_dirty_bitmap(job->copy_bitmap, start,
job->cluster_size * nr_clusters);
--
2.21.0
- [PATCH v13 00/15] backup-top filter driver for backup, Vladimir Sementsov-Ogievskiy, 2019/09/20
- [PATCH v13 01/15] block/backup: fix max_transfer handling for copy_range, Vladimir Sementsov-Ogievskiy, 2019/09/20
- [PATCH v13 03/15] block/backup: split shareable copying part from backup_do_cow, Vladimir Sementsov-Ogievskiy, 2019/09/20
- [PATCH v13 13/15] block: add lock/unlock range functions, Vladimir Sementsov-Ogievskiy, 2019/09/20
- [PATCH v13 06/15] block/backup: fix block-comment style, Vladimir Sementsov-Ogievskiy, 2019/09/20
- [PATCH v13 02/15] block/backup: fix backup_cow_with_offload for last cluster,
Vladimir Sementsov-Ogievskiy <=
- [PATCH v13 08/15] block: teach bdrv_debug_breakpoint skip filters with backing, Vladimir Sementsov-Ogievskiy, 2019/09/20
- [PATCH v13 14/15] block: introduce backup-top filter driver, Vladimir Sementsov-Ogievskiy, 2019/09/20
- [PATCH v13 04/15] block/backup: improve comment about image fleecing, Vladimir Sementsov-Ogievskiy, 2019/09/20
- [PATCH v13 05/15] block/backup: introduce BlockCopyState, Vladimir Sementsov-Ogievskiy, 2019/09/20
- [PATCH v13 07/15] block: move block_copy from block/backup.c to separate file, Vladimir Sementsov-Ogievskiy, 2019/09/20
- [PATCH v13 12/15] block/io: refactor wait_serialising_requests, Vladimir Sementsov-Ogievskiy, 2019/09/20
- [PATCH v13 11/15] iotests: 257: drop device_add, Vladimir Sementsov-Ogievskiy, 2019/09/20
- [PATCH v13 10/15] iotests: 257: drop unused Drive.device field, Vladimir Sementsov-Ogievskiy, 2019/09/20
- [PATCH v13 09/15] iotests: prepare 124 and 257 bitmap querying for backup-top filter, Vladimir Sementsov-Ogievskiy, 2019/09/20
- [PATCH v13 15/15] block/backup: use backup-top instead of write notifiers, Vladimir Sementsov-Ogievskiy, 2019/09/20