From: "Denis V. Lunev" <den@openvz.org>
To: qemu-devel@nongnu.org
Cc: qemu-block@nongnu.org, stefanha@gmail.com,
Alexander Ivanov <alexander.ivanov@virtuozzo.com>,
"Denis V . Lunev" <den@openvz.org>
Subject: [PULL 10/18] parallels: Add data_off check
Date: Wed, 6 Sep 2023 17:54:05 +0200 [thread overview]
Message-ID: <20230906155413.656644-1-den@openvz.org> (raw)
In-Reply-To: <20230906154942.656537-1-den@openvz.org>
From: Alexander Ivanov <alexander.ivanov@virtuozzo.com>
data_off field of the parallels image header can be corrupted. Check if
this field greater than the header + BAT size and less than file size.
Signed-off-by: Alexander Ivanov <alexander.ivanov@virtuozzo.com>
Reviewed-by: Denis V. Lunev <den@openvz.org>
Signed-off-by: Denis V. Lunev <den@openvz.org>
---
block/parallels.c | 80 +++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 80 insertions(+)
diff --git a/block/parallels.c b/block/parallels.c
index 3414807089..103acb7b40 100644
--- a/block/parallels.c
+++ b/block/parallels.c
@@ -450,6 +450,81 @@ static void parallels_check_unclean(BlockDriverState *bs,
}
}
+/*
+ * Returns true if data_off is correct, otherwise false. In both cases
+ * correct_offset is set to the proper value.
+ */
+static bool parallels_test_data_off(BDRVParallelsState *s,
+ int64_t file_nb_sectors,
+ uint32_t *correct_offset)
+{
+ uint32_t data_off, min_off;
+ bool old_magic;
+
+ /*
+ * There are two slightly different image formats: with "WithoutFreeSpace"
+ * or "WithouFreSpacExt" magic words. Call the first one as "old magic".
+ * In such images data_off field can be zero. In this case the offset is
+ * calculated as the end of BAT table plus some padding to ensure sector
+ * size alignment.
+ */
+ old_magic = !memcmp(s->header->magic, HEADER_MAGIC, 16);
+
+ min_off = DIV_ROUND_UP(bat_entry_off(s->bat_size), BDRV_SECTOR_SIZE);
+ if (!old_magic) {
+ min_off = ROUND_UP(min_off, s->cluster_size / BDRV_SECTOR_SIZE);
+ }
+
+ if (correct_offset) {
+ *correct_offset = min_off;
+ }
+
+ data_off = le32_to_cpu(s->header->data_off);
+ if (data_off == 0 && old_magic) {
+ return true;
+ }
+
+ if (data_off < min_off || data_off > file_nb_sectors) {
+ return false;
+ }
+
+ if (correct_offset) {
+ *correct_offset = data_off;
+ }
+
+ return true;
+}
+
+static int coroutine_fn GRAPH_RDLOCK
+parallels_check_data_off(BlockDriverState *bs, BdrvCheckResult *res,
+ BdrvCheckMode fix)
+{
+ BDRVParallelsState *s = bs->opaque;
+ int64_t file_size;
+ uint32_t data_off;
+
+ file_size = bdrv_co_nb_sectors(bs->file->bs);
+ if (file_size < 0) {
+ res->check_errors++;
+ return file_size;
+ }
+
+ if (parallels_test_data_off(s, file_size, &data_off)) {
+ return 0;
+ }
+
+ res->corruptions++;
+ if (fix & BDRV_FIX_ERRORS) {
+ s->header->data_off = cpu_to_le32(data_off);
+ res->corruptions_fixed++;
+ }
+
+ fprintf(stderr, "%s data_off field has incorrect value\n",
+ fix & BDRV_FIX_ERRORS ? "Repairing" : "ERROR");
+
+ return 0;
+}
+
static int coroutine_fn GRAPH_RDLOCK
parallels_check_outside_image(BlockDriverState *bs, BdrvCheckResult *res,
BdrvCheckMode fix)
@@ -713,6 +788,11 @@ parallels_co_check(BlockDriverState *bs, BdrvCheckResult *res,
WITH_QEMU_LOCK_GUARD(&s->lock) {
parallels_check_unclean(bs, res, fix);
+ ret = parallels_check_data_off(bs, res, fix);
+ if (ret < 0) {
+ return ret;
+ }
+
ret = parallels_check_outside_image(bs, res, fix);
if (ret < 0) {
return ret;
--
2.34.1
next prev parent reply other threads:[~2023-09-06 15:55 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-06 15:49 [PULL 00/18] Parallels format driver Denis V. Lunev
2023-09-06 15:49 ` [PULL 01/18] MAINTAINERS: add tree to keep parallels format driver changes Denis V. Lunev
2023-09-06 15:49 ` [PULL 02/18] parallels: Fix comments formatting inside parallels driver Denis V. Lunev
2023-09-06 15:49 ` [PULL 03/18] parallels: Incorrect data end calculation in parallels_open() Denis V. Lunev
2023-09-06 15:49 ` [PULL 04/18] parallels: Check if data_end greater than the file size Denis V. Lunev
2023-09-06 15:49 ` [PULL 05/18] parallels: Add "explicit" argument to parallels_check_leak() Denis V. Lunev
2023-09-06 15:49 ` [PULL 06/18] parallels: Add data_start field to BDRVParallelsState Denis V. Lunev
2023-09-06 15:49 ` [PULL 07/18] parallels: Add checking and repairing duplicate offsets in BAT Denis V. Lunev
2023-09-06 15:49 ` [PULL 08/18] parallels: Image repairing in parallels_open() Denis V. Lunev
2023-09-06 15:49 ` [PULL 09/18] parallels: Use bdrv_co_getlength() in parallels_check_outside_image() Denis V. Lunev
2023-09-06 15:54 ` Denis V. Lunev [this message]
2023-09-06 15:54 ` [PULL 11/18] parallels: Add data_off repairing to parallels_open() Denis V. Lunev
2023-09-06 15:54 ` [PULL 12/18] iotests: Add out-of-image check test for parallels format Denis V. Lunev
2023-09-06 15:54 ` [PULL 13/18] iotests: Add leak " Denis V. Lunev
2023-09-06 15:54 ` [PULL 14/18] iotests: Add test for BAT entries duplication check Denis V. Lunev
2023-09-06 15:54 ` [PULL 15/18] iotests: Refactor tests of parallels images checks (131) Denis V. Lunev
2023-09-06 15:54 ` [PULL 16/18] iotests: Fix cluster size in parallels images tests (131) Denis V. Lunev
2023-09-06 15:54 ` [PULL 17/18] iotests: Fix test 131 after repair was added to parallels_open() Denis V. Lunev
2023-09-06 15:54 ` [PULL 18/18] iotests: Add test for data_off check Denis V. Lunev
2023-09-07 15:43 ` [PULL 00/18] Parallels format driver Stefan Hajnoczi
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=20230906155413.656644-1-den@openvz.org \
--to=den@openvz.org \
--cc=alexander.ivanov@virtuozzo.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=stefanha@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).