qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
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 2/9] parallels: Fix data_end field value in parallels_co_check()
Date: Thu, 18 Aug 2022 17:14:49 +0200	[thread overview]
Message-ID: <20220818151456.2118470-3-alexander.ivanov@virtuozzo.com> (raw)
In-Reply-To: <20220818151456.2118470-1-alexander.ivanov@virtuozzo.com>

When an image is opened for check there is no error if an offset in the BAT
points outside the image. In such a way we can repair the image.
Out-of-image offsets are repaired in the check, but data_end field
still points outside. Fix this field by file size.

Signed-off-by: Alexander Ivanov <alexander.ivanov@virtuozzo.com>
---
 block/parallels.c | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/block/parallels.c b/block/parallels.c
index c245ca35cd..24c05b95e8 100644
--- a/block/parallels.c
+++ b/block/parallels.c
@@ -513,7 +513,15 @@ static int coroutine_fn parallels_co_check(BlockDriverState *bs,
             res->leaks_fixed += count;
         }
     }
-
+    /*
+     * If there were an out-of-image cluster it would be repaired,
+     * but s->data_end still would point outside image.
+     * Fix s->data_end by the file size.
+     */
+    size >>= BDRV_SECTOR_BITS;
+    if (s->data_end > size) {
+        s->data_end = size;
+    }
 out:
     qemu_co_mutex_unlock(&s->lock);
     return ret;
-- 
2.34.1



  parent reply	other threads:[~2022-08-18 15:21 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-08-18 15:14 [PATCH 0/9] parallels: Refactor the code of images checks and fix a bug Alexander Ivanov
2022-08-18 15:14 ` [PATCH 1/9] parallels: Out of image offset in BAT leads to image inflation Alexander Ivanov
2022-08-18 15:14 ` Alexander Ivanov [this message]
2022-08-19 12:58   ` [PATCH 2/9] parallels: Fix data_end field value in parallels_co_check() Denis V. Lunev
2022-08-18 15:14 ` [PATCH 3/9] parallels: create parallels_set_bat_entry_helper() to assign BAT value Alexander Ivanov
2022-08-18 15:14 ` [PATCH 4/9] parallels: Use generic infrastructure for BAT writing in parallels_co_check() Alexander Ivanov
2022-08-18 15:14 ` [PATCH 5/9] parallels: Move check of unclean image to a separate function Alexander Ivanov
2022-08-18 15:14 ` [PATCH 6/9] parallels: Move check of cluster outside " Alexander Ivanov
2022-08-19 12:56   ` Denis V. Lunev
2022-08-18 15:14 ` [PATCH 7/9] parallels: Move check of leaks " Alexander Ivanov
2022-08-18 15:14 ` [PATCH 8/9] parallels: Move statistic collection " Alexander Ivanov
2022-08-18 15:14 ` [PATCH 9/9] parallels: Replace qemu_co_mutex_lock by WITH_QEMU_LOCK_GUARD Alexander Ivanov
2022-08-19 12:53   ` Denis V. Lunev
2022-08-19  9:48 ` [PATCH 0/9] parallels: Refactor the code of images checks and fix a bug Denis V. Lunev

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=20220818151456.2118470-3-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).