[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 30/32] qcow2-refcount: check_refcounts_l1(): check reserved bits
From: |
Hanna Reitz |
Subject: |
[PULL 30/32] qcow2-refcount: check_refcounts_l1(): check reserved bits |
Date: |
Wed, 15 Sep 2021 19:53:16 +0200 |
From: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
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>
Message-Id: <20210914122454.141075-10-vsementsov@virtuozzo.com>
Signed-off-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 3c89e09599..1c246b9227 100644
--- a/block/qcow2-refcount.c
+++ b/block/qcow2-refcount.c
@@ -1902,6 +1902,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.31.1
- [PULL 18/32] simplebench: add img_bench_templater.py, (continued)
- [PULL 18/32] simplebench: add img_bench_templater.py, Hanna Reitz, 2021/09/15
- [PULL 21/32] qemu-img: Allow target be aligned to sector size, Hanna Reitz, 2021/09/15
- [PULL 20/32] qcow2: handle_dependencies(): relax conflict detection, Hanna Reitz, 2021/09/15
- [PULL 22/32] qcow2-refcount: improve style of check_refcounts_l2(), Hanna Reitz, 2021/09/15
- [PULL 23/32] qcow2: compressed read: simplify cluster descriptor passing, Hanna Reitz, 2021/09/15
- [PULL 25/32] qcow2-refcount: introduce fix_l2_entry_by_zero(), Hanna Reitz, 2021/09/15
- [PULL 24/32] qcow2: introduce qcow2_parse_compressed_l2_entry() helper, Hanna Reitz, 2021/09/15
- [PULL 26/32] qcow2-refcount: fix_l2_entry_by_zero(): also zero L2 entry bitmap, Hanna Reitz, 2021/09/15
- [PULL 27/32] qcow2-refcount: check_refcounts_l2(): check l2_bitmap, Hanna Reitz, 2021/09/15
- [PULL 28/32] qcow2-refcount: check_refcounts_l2(): check reserved bits, Hanna Reitz, 2021/09/15
- [PULL 30/32] qcow2-refcount: check_refcounts_l1(): check reserved bits,
Hanna Reitz <=
- [PULL 29/32] qcow2-refcount: improve style of check_refcounts_l1(), Hanna Reitz, 2021/09/15
- [PULL 31/32] qcow2-refcount: check_refblocks(): add separate message for reserved, Hanna Reitz, 2021/09/15
- [PULL 32/32] qemu-img: Add -F shorthand to convert, Hanna Reitz, 2021/09/15
- Re: [PULL 00/32] Block patches, Peter Maydell, 2021/09/16