From: Kirill Tkhai <ktkhai@virtuozzo.com>
To: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>,
qemu-block@nongnu.org
Cc: qemu-devel@nongnu.org, mreitz@redhat.com, kwolf@redhat.com,
den@openvz.org, eblake@redhat.com, berto@igalia.com
Subject: Re: [PATCH v2 09/10] qcow2-refcount: check_refcounts_l1(): check reserved bits
Date: Tue, 11 May 2021 19:55:41 +0300 [thread overview]
Message-ID: <5bf37795-f905-66bb-518e-a899c27dbb2c@virtuozzo.com> (raw)
In-Reply-To: <20210505065955.13964-10-vsementsov@virtuozzo.com>
On 05.05.2021 09:59, Vladimir Sementsov-Ogievskiy wrote:
> Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
> Reviewed-by: Eric Blake <eblake@redhat.com>
> ---
> block/qcow2.h | 1 +
> block/qcow2-refcount.c | 6 ++++++
> 2 files changed, 7 insertions(+)
>
> diff --git a/block/qcow2.h b/block/qcow2.h
> index b8b1093b61..58fd7f1678 100644
> --- a/block/qcow2.h
> +++ b/block/qcow2.h
> @@ -586,6 +586,7 @@ typedef enum QCow2MetadataOverlap {
> (QCOW2_OL_CACHED | QCOW2_OL_INACTIVE_L2)
>
> #define L1E_OFFSET_MASK 0x00fffffffffffe00ULL
> +#define L1E_RESERVED_MASK 0x7f000000000001ffULL
> #define L2E_OFFSET_MASK 0x00fffffffffffe00ULL
> #define L2E_STD_RESERVED_MASK 0x3f000000000001feULL
>
> diff --git a/block/qcow2-refcount.c b/block/qcow2-refcount.c
> index 69294a94fe..15c4f6b075 100644
> --- a/block/qcow2-refcount.c
> +++ b/block/qcow2-refcount.c
> @@ -1904,6 +1904,12 @@ static int check_refcounts_l1(BlockDriverState *bs,
> continue;
> }
>
> + if (l1_table[i] & L1E_RESERVED_MASK) {
> + fprintf(stderr, "ERROR found L1 entry with reserved bits set: "
> + "%" PRIx64, l1_table[i]);
'\n' is missed.
The rest is OK for me.
Tested-by: Kirill Tkhai <ktkhai@virtuozzo.com>
> + res->corruptions++;
> + }
> +
> l2_offset = l1_table[i] & L1E_OFFSET_MASK;
>
> /* Mark L2 table as used */
>
next prev parent reply other threads:[~2021-05-11 16:59 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-05 6:59 [PATCH v2 00/10] qcow2 check: check some reserved bits and subcluster bitmaps Vladimir Sementsov-Ogievskiy
2021-05-05 6:59 ` [PATCH v2 01/10] qcow2-refcount: improve style of check_refcounts_l2() Vladimir Sementsov-Ogievskiy
2021-05-05 6:59 ` [PATCH v2 02/10] qcow2: compressed read: simplify cluster descriptor passing Vladimir Sementsov-Ogievskiy
2021-05-10 15:36 ` Alberto Garcia
2021-05-05 6:59 ` [PATCH v2 03/10] qcow2: introduce qcow2_parse_compressed_l2_entry() helper Vladimir Sementsov-Ogievskiy
2021-05-05 6:59 ` [PATCH v2 04/10] qcow2-refcount: introduce fix_l2_entry_by_zero() Vladimir Sementsov-Ogievskiy
2021-05-05 6:59 ` [PATCH v2 05/10] qcow2-refcount: fix_l2_entry_by_zero(): also zero L2 entry bitmap Vladimir Sementsov-Ogievskiy
2021-05-05 6:59 ` [PATCH v2 06/10] qcow2-refcount: check_refcounts_l2(): check l2_bitmap Vladimir Sementsov-Ogievskiy
2021-05-11 16:49 ` Kirill Tkhai
2021-05-05 6:59 ` [PATCH v2 07/10] qcow2-refcount: check_refcounts_l2(): check reserved bits Vladimir Sementsov-Ogievskiy
2021-05-11 16:54 ` Kirill Tkhai
2021-05-05 6:59 ` [PATCH v2 08/10] qcow2-refcount: improve style of check_refcounts_l1() Vladimir Sementsov-Ogievskiy
2021-05-05 6:59 ` [PATCH v2 09/10] qcow2-refcount: check_refcounts_l1(): check reserved bits Vladimir Sementsov-Ogievskiy
2021-05-11 16:55 ` Kirill Tkhai [this message]
2021-05-05 6:59 ` [PATCH v2 10/10] qcow2-refcount: check_refblocks(): add separate message for reserved Vladimir Sementsov-Ogievskiy
2021-05-11 17:09 ` Kirill Tkhai
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=5bf37795-f905-66bb-518e-a899c27dbb2c@virtuozzo.com \
--to=ktkhai@virtuozzo.com \
--cc=berto@igalia.com \
--cc=den@openvz.org \
--cc=eblake@redhat.com \
--cc=kwolf@redhat.com \
--cc=mreitz@redhat.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=vsementsov@virtuozzo.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).