From: Alexander Ivanov <alexander.ivanov@virtuozzo.com>
To: qemu-devel@nongnu.org
Cc: qemu-block@nongnu.org, den@virtuozzo.com, stefanha@redhat.com,
vsementsov@yandex-team.ru, kwolf@redhat.com, hreitz@redhat.com
Subject: [PATCH v11 03/12] parallels: Fix image_end_offset and data_end after out-of-image check
Date: Mon, 24 Apr 2023 11:31:38 +0200 [thread overview]
Message-ID: <20230424093147.197643-4-alexander.ivanov@virtuozzo.com> (raw)
In-Reply-To: <20230424093147.197643-1-alexander.ivanov@virtuozzo.com>
Set data_end to the end of the last cluster inside the image. In such a
way we can be sure that corrupted offsets in the BAT can't affect on the
image size. If there are no allocated clusters set image_end_offset by
data_end.
Signed-off-by: Alexander Ivanov <alexander.ivanov@virtuozzo.com>
Reviewed-by: Denis V. Lunev <den@openvz.org>
---
block/parallels.c | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/block/parallels.c b/block/parallels.c
index 4d6284a314..dec4fe1f06 100644
--- a/block/parallels.c
+++ b/block/parallels.c
@@ -490,7 +490,13 @@ parallels_co_check(BlockDriverState *bs, BdrvCheckResult *res,
}
}
- res->image_end_offset = high_off + s->cluster_size;
+ if (high_off == 0) {
+ res->image_end_offset = s->data_end << BDRV_SECTOR_BITS;
+ } else {
+ res->image_end_offset = high_off + s->cluster_size;
+ s->data_end = res->image_end_offset >> BDRV_SECTOR_BITS;
+ }
+
if (size > res->image_end_offset) {
int64_t count;
count = DIV_ROUND_UP(size - res->image_end_offset, s->cluster_size);
--
2.34.1
next prev parent reply other threads:[~2023-04-24 9:34 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-04-24 9:31 [PATCH v11 00/12] parallels: Refactor the code of images checks and fix a bug Alexander Ivanov
2023-04-24 9:31 ` [PATCH v11 01/12] parallels: Out of image offset in BAT leads to image inflation Alexander Ivanov
2023-04-24 9:31 ` [PATCH v11 02/12] parallels: Fix high_off calculation in parallels_co_check() Alexander Ivanov
2023-04-24 9:31 ` Alexander Ivanov [this message]
2023-04-24 9:31 ` [PATCH v11 04/12] parallels: create parallels_set_bat_entry_helper() to assign BAT value Alexander Ivanov
2023-04-24 9:31 ` [PATCH v11 05/12] parallels: Use generic infrastructure for BAT writing in parallels_co_check() Alexander Ivanov
2023-04-24 9:31 ` [PATCH v11 06/12] parallels: Move check of unclean image to a separate function Alexander Ivanov
2023-04-24 9:31 ` [PATCH v11 07/12] parallels: Move check of cluster outside " Alexander Ivanov
2023-04-24 9:31 ` [PATCH v11 08/12] parallels: Fix statistics calculation Alexander Ivanov
2023-04-24 9:31 ` [PATCH v11 09/12] parallels: Move check of leaks to a separate function Alexander Ivanov
2023-04-24 9:31 ` [PATCH v11 10/12] parallels: Move statistic collection " Alexander Ivanov
2023-04-24 9:31 ` [PATCH v11 11/12] parallels: Replace qemu_co_mutex_lock by WITH_QEMU_LOCK_GUARD Alexander Ivanov
2023-04-24 9:31 ` [PATCH v11 12/12] parallels: Incorrect condition in out-of-image check Alexander Ivanov
2023-04-26 15:07 ` [PATCH v11 00/12] parallels: Refactor the code of images checks and fix a bug Denis V. Lunev
2023-04-26 19:22 ` Alexander Ivanov
2023-04-28 16:36 ` Hanna Czenczek
-- strict thread matches above, loose matches on Subject: below --
2023-04-24 9:16 Alexander Ivanov
2023-04-24 9:16 ` [PATCH v11 03/12] parallels: Fix image_end_offset and data_end after out-of-image check Alexander Ivanov
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=20230424093147.197643-4-alexander.ivanov@virtuozzo.com \
--to=alexander.ivanov@virtuozzo.com \
--cc=den@virtuozzo.com \
--cc=hreitz@redhat.com \
--cc=kwolf@redhat.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=stefanha@redhat.com \
--cc=vsementsov@yandex-team.ru \
/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).