[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 7/8] block/qcow2-refcount: fix out-of-file L1 ent
From: |
Vladimir Sementsov-Ogievskiy |
Subject: |
[Qemu-devel] [PATCH v3 7/8] block/qcow2-refcount: fix out-of-file L1 entries to be zero |
Date: |
Thu, 11 Oct 2018 18:16:22 +0300 |
Zero out corrupted L1 table entry, which reference L2 table out of
underlying file.
Zero L1 table entry means that "the L2 table and all clusters described
by this L2 table are unallocated."
Signed-off-by: Vladimir Sementsov-Ogievskiy <address@hidden>
---
block/qcow2-refcount.c | 26 ++++++++++++++++++++++++++
1 file changed, 26 insertions(+)
diff --git a/block/qcow2-refcount.c b/block/qcow2-refcount.c
index 65e0fd2de3..5ebe292fc1 100644
--- a/block/qcow2-refcount.c
+++ b/block/qcow2-refcount.c
@@ -1803,6 +1803,13 @@ static int check_refcounts_l1(BlockDriverState *bs,
BDRVQcow2State *s = bs->opaque;
uint64_t *l1_table = NULL, l2_offset, l1_size2;
int i, ret;
+ bool fix_er = fix & BDRV_FIX_ERRORS;
+ RepTableType type = active ? REP_ACTIVE_L1 : REP_INACTIVE_L1;
+ int64_t file_len = bdrv_getlength(bs->file->bs);
+
+ if (file_len < 0) {
+ return file_len;
+ }
l1_size2 = l1_size * sizeof(uint64_t);
@@ -1837,6 +1844,25 @@ static int check_refcounts_l1(BlockDriverState *bs,
if (l2_offset) {
/* Mark L2 table as used */
l2_offset &= L1E_OFFSET_MASK;
+ if (l2_offset >= file_len) {
+ fprintf(stderr,
+ "%s: l2 table offset out of file: offset 0x%" PRIx64
+ "\n", fix_er ? "Repairing" : "ERROR", l2_offset);
+ if (fix_er) {
+ ret = repair_table_entry(bs, res, type,
+ l1_table_offset, i, 0);
+ if (ret < 0) {
+ /* Something is seriously wrong, so abort checking
+ * this L1 table */
+ goto fail;
+ }
+ } else {
+ res->corruptions++;
+ }
+
+ continue;
+ }
+
ret = qcow2_inc_refcounts_imrt(bs, res,
refcount_table, refcount_table_size,
l2_offset, s->cluster_size);
--
2.18.0
- [Qemu-devel] [PATCH v3 0/8] qcow2 check improvements, Vladimir Sementsov-Ogievskiy, 2018/10/11
- [Qemu-devel] [PATCH v3 2/8] block/qcow2-refcount: avoid eating RAM, Vladimir Sementsov-Ogievskiy, 2018/10/11
- [Qemu-devel] [PATCH v3 7/8] block/qcow2-refcount: fix out-of-file L1 entries to be zero,
Vladimir Sementsov-Ogievskiy <=
- [Qemu-devel] [PATCH v3 1/8] block/qcow2-refcount: fix check_oflag_copied, Vladimir Sementsov-Ogievskiy, 2018/10/11
- [Qemu-devel] [PATCH v3 5/8] block/qcow2-refcount: check_refcounts_l2: don't count corrupted entries, Vladimir Sementsov-Ogievskiy, 2018/10/11
- [Qemu-devel] [PATCH v3 3/8] block/qcow2-refcount: check_refcounts_l2: refactor compressed case, Vladimir Sementsov-Ogievskiy, 2018/10/11
- [Qemu-devel] [PATCH v3 4/8] block/qcow2-refcount: check_refcounts_l2: reduce ignored overlaps, Vladimir Sementsov-Ogievskiy, 2018/10/11
- [Qemu-devel] [PATCH v3 6/8] block/qcow2-refcount: refactor fixing L2 entry, Vladimir Sementsov-Ogievskiy, 2018/10/11
- [Qemu-devel] [PATCH v3 8/8] block/qcow2-refcount: fix out-of-file L2 entries, Vladimir Sementsov-Ogievskiy, 2018/10/11