From: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
To: qemu-block@nongnu.org
Cc: fam@euphon.net, kwolf@redhat.com, vsementsov@virtuozzo.com,
wencongyang2@huawei.com, xiechanglong.d@gmail.com,
qemu-devel@nongnu.org, armbru@redhat.com, jsnow@redhat.com,
stefanha@redhat.com, den@openvz.org, mreitz@redhat.com
Subject: [PATCH v13 02/15] block/backup: fix backup_cow_with_offload for last cluster
Date: Fri, 20 Sep 2019 17:20:43 +0300 [thread overview]
Message-ID: <20190920142056.12778-3-vsementsov@virtuozzo.com> (raw)
In-Reply-To: <20190920142056.12778-1-vsementsov@virtuozzo.com>
We shouldn't try to copy bytes beyond EOF. Fix it.
Fixes: 9ded4a0114968e
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: John Snow <jsnow@redhat.com>
---
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
next prev parent reply other threads:[~2019-09-20 14:25 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-20 14:20 [PATCH v13 00/15] backup-top filter driver for backup Vladimir Sementsov-Ogievskiy
2019-09-20 14:20 ` [PATCH v13 01/15] block/backup: fix max_transfer handling for copy_range Vladimir Sementsov-Ogievskiy
2019-09-20 14:20 ` Vladimir Sementsov-Ogievskiy [this message]
2019-09-20 14:20 ` [PATCH v13 03/15] block/backup: split shareable copying part from backup_do_cow Vladimir Sementsov-Ogievskiy
2019-09-20 14:20 ` [PATCH v13 04/15] block/backup: improve comment about image fleecing Vladimir Sementsov-Ogievskiy
2019-09-20 14:20 ` [PATCH v13 05/15] block/backup: introduce BlockCopyState Vladimir Sementsov-Ogievskiy
2019-09-20 14:20 ` [PATCH v13 06/15] block/backup: fix block-comment style Vladimir Sementsov-Ogievskiy
2019-09-20 14:20 ` [PATCH v13 07/15] block: move block_copy from block/backup.c to separate file Vladimir Sementsov-Ogievskiy
2019-09-20 14:20 ` [PATCH v13 08/15] block: teach bdrv_debug_breakpoint skip filters with backing Vladimir Sementsov-Ogievskiy
2019-09-20 14:20 ` [PATCH v13 09/15] iotests: prepare 124 and 257 bitmap querying for backup-top filter Vladimir Sementsov-Ogievskiy
2019-09-20 14:20 ` [PATCH v13 10/15] iotests: 257: drop unused Drive.device field Vladimir Sementsov-Ogievskiy
2019-09-20 14:20 ` [PATCH v13 11/15] iotests: 257: drop device_add Vladimir Sementsov-Ogievskiy
2019-09-20 14:20 ` [PATCH v13 12/15] block/io: refactor wait_serialising_requests Vladimir Sementsov-Ogievskiy
2019-09-20 14:20 ` [PATCH v13 13/15] block: add lock/unlock range functions Vladimir Sementsov-Ogievskiy
2019-09-20 14:20 ` [PATCH v13 14/15] block: introduce backup-top filter driver Vladimir Sementsov-Ogievskiy
2019-09-20 14:20 ` [PATCH v13 15/15] block/backup: use backup-top instead of write notifiers Vladimir Sementsov-Ogievskiy
2019-09-20 15:55 ` [PATCH v13 00/15] backup-top filter driver for backup Max Reitz
2019-09-20 16:01 ` Vladimir Sementsov-Ogievskiy
2019-09-20 16:13 ` John Snow
2019-09-25 16:58 ` [PATCH 16/15 v13] block/block-copy: fix block_copy Vladimir Sementsov-Ogievskiy
2019-09-25 19:19 ` [PATCH v13 00/15] backup-top filter driver for backup Vladimir Sementsov-Ogievskiy
2019-09-25 19:28 ` Vladimir Sementsov-Ogievskiy
2019-09-26 11:26 ` Max Reitz
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190920142056.12778-3-vsementsov@virtuozzo.com \
--to=vsementsov@virtuozzo.com \
--cc=armbru@redhat.com \
--cc=den@openvz.org \
--cc=fam@euphon.net \
--cc=jsnow@redhat.com \
--cc=kwolf@redhat.com \
--cc=mreitz@redhat.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=stefanha@redhat.com \
--cc=wencongyang2@huawei.com \
--cc=xiechanglong.d@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).