[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 07/10] qcow2-refcount: check_refcounts_l2(): check reserved bits
From: |
Vladimir Sementsov-Ogievskiy |
Subject: |
[PATCH 07/10] qcow2-refcount: check_refcounts_l2(): check reserved bits |
Date: |
Tue, 4 May 2021 18:20:20 +0300 |
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
---
block/qcow2.h | 1 +
block/qcow2-refcount.c | 12 +++++++++++-
2 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/block/qcow2.h b/block/qcow2.h
index c0e1e83796..b8b1093b61 100644
--- a/block/qcow2.h
+++ b/block/qcow2.h
@@ -587,6 +587,7 @@ typedef enum QCow2MetadataOverlap {
#define L1E_OFFSET_MASK 0x00fffffffffffe00ULL
#define L2E_OFFSET_MASK 0x00fffffffffffe00ULL
+#define L2E_STD_RESERVED_MASK 0x3f000000000001feULL
#define REFT_OFFSET_MASK 0xfffffffffffffe00ULL
diff --git a/block/qcow2-refcount.c b/block/qcow2-refcount.c
index dc940f3003..44fc0dd5dc 100644
--- a/block/qcow2-refcount.c
+++ b/block/qcow2-refcount.c
@@ -1682,8 +1682,18 @@ static int check_refcounts_l2(BlockDriverState *bs,
BdrvCheckResult *res,
int csize;
l2_entry = get_l2_entry(s, l2_table, i);
uint64_t l2_bitmap = get_l2_bitmap(s, l2_table, i);
+ QCow2ClusterType type = qcow2_get_cluster_type(bs, l2_entry);
- switch (qcow2_get_cluster_type(bs, l2_entry)) {
+ if (type != QCOW2_CLUSTER_COMPRESSED) {
+ /* Check reserved bits of Standard Cluster Descriptor */
+ if (l2_entry & L2E_STD_RESERVED_MASK) {
+ fprintf(stderr, "ERROR found l2 entry with reserved bits set: "
+ "%" PRIx64, l2_entry);
+ res->corruptions++;
+ }
+ }
+
+ switch (type) {
case QCOW2_CLUSTER_COMPRESSED:
/* Compressed clusters don't have QCOW_OFLAG_COPIED */
if (l2_entry & QCOW_OFLAG_COPIED) {
--
2.29.2
- [PATCH 01/10] qcow2-refcount: improve style of check_refcounts_l2(), (continued)
- [PATCH 01/10] qcow2-refcount: improve style of check_refcounts_l2(), Vladimir Sementsov-Ogievskiy, 2021/05/04
- [PATCH 03/10] qcow2: introduce qcow2_parse_compressed_l2_entry() helper, Vladimir Sementsov-Ogievskiy, 2021/05/04
- [PATCH 04/10] qcow2-refcount: introduce fix_l2_entry_by_zero(), Vladimir Sementsov-Ogievskiy, 2021/05/04
- [PATCH 05/10] qcow2-refcount: fix_l2_entry_by_zero(): also zero L2 entry bitmap, Vladimir Sementsov-Ogievskiy, 2021/05/04
- [PATCH 06/10] qcow2-refcount: check_refcounts_l2(): check l2_bitmap, Vladimir Sementsov-Ogievskiy, 2021/05/04
- [PATCH 07/10] qcow2-refcount: check_refcounts_l2(): check reserved bits,
Vladimir Sementsov-Ogievskiy <=
- [PATCH 08/10] qcow2-refcount: improve style of check_refcounts_l1(), Vladimir Sementsov-Ogievskiy, 2021/05/04
- [PATCH 10/10] qcow2-refcount: check_refblocks(): add separate message for reserved, Vladimir Sementsov-Ogievskiy, 2021/05/04
- [PATCH 09/10] qcow2-refcount: check_refcounts_l1(): check reserved bits, Vladimir Sementsov-Ogievskiy, 2021/05/04
- [PATCH 02/10] qcow2: compressed read: simplify cluster descriptor passing, Vladimir Sementsov-Ogievskiy, 2021/05/04