[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v4 09/10] qcow2-refcount: check_refcounts_l1(): check reserved bi
From: |
Vladimir Sementsov-Ogievskiy |
Subject: |
[PATCH v4 09/10] qcow2-refcount: check_refcounts_l1(): check reserved bits |
Date: |
Tue, 14 Sep 2021 15:24:53 +0300 |
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Tested-by: Kirill Tkhai <ktkhai@virtuozzo.com>
Reviewed-by: Hanna Reitz <hreitz@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 153e5ca087..75751a0181 100644
--- a/block/qcow2-refcount.c
+++ b/block/qcow2-refcount.c
@@ -1900,6 +1900,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 "\n", l1_table[i]);
+ res->corruptions++;
+ }
+
l2_offset = l1_table[i] & L1E_OFFSET_MASK;
/* Mark L2 table as used */
--
2.29.2
- [PATCH v4 00/10] qcow2 check: check some reserved bits and subcluster bitmaps, Vladimir Sementsov-Ogievskiy, 2021/09/14
- [PATCH v4 04/10] qcow2-refcount: introduce fix_l2_entry_by_zero(), Vladimir Sementsov-Ogievskiy, 2021/09/14
- [PATCH v4 01/10] qcow2-refcount: improve style of check_refcounts_l2(), Vladimir Sementsov-Ogievskiy, 2021/09/14
- [PATCH v4 05/10] qcow2-refcount: fix_l2_entry_by_zero(): also zero L2 entry bitmap, Vladimir Sementsov-Ogievskiy, 2021/09/14
- [PATCH v4 03/10] qcow2: introduce qcow2_parse_compressed_l2_entry() helper, Vladimir Sementsov-Ogievskiy, 2021/09/14
- [PATCH v4 02/10] qcow2: compressed read: simplify cluster descriptor passing, Vladimir Sementsov-Ogievskiy, 2021/09/14
- [PATCH v4 09/10] qcow2-refcount: check_refcounts_l1(): check reserved bits,
Vladimir Sementsov-Ogievskiy <=
- [PATCH v4 06/10] qcow2-refcount: check_refcounts_l2(): check l2_bitmap, Vladimir Sementsov-Ogievskiy, 2021/09/14
- [PATCH v4 10/10] qcow2-refcount: check_refblocks(): add separate message for reserved, Vladimir Sementsov-Ogievskiy, 2021/09/14
- [PATCH v4 07/10] qcow2-refcount: check_refcounts_l2(): check reserved bits, Vladimir Sementsov-Ogievskiy, 2021/09/14
- [PATCH v4 08/10] qcow2-refcount: improve style of check_refcounts_l1(), Vladimir Sementsov-Ogievskiy, 2021/09/14
- Re: [PATCH v4 00/10] qcow2 check: check some reserved bits and subcluster bitmaps, Hanna Reitz, 2021/09/15