[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 7/7] block/qcow2-refcount: fix out-of-file L2 ent
From: |
Vladimir Sementsov-Ogievskiy |
Subject: |
[Qemu-devel] [PATCH v2 7/7] block/qcow2-refcount: fix out-of-file L2 entries to be read-as-zero |
Date: |
Fri, 17 Aug 2018 15:22:19 +0300 |
Rewrite corrupted L2 table entry, which reference space out of
underlying file.
Make this L2 table entry read-as-all-zeros without any allocation.
Signed-off-by: Vladimir Sementsov-Ogievskiy <address@hidden>
---
block/qcow2-refcount.c | 32 ++++++++++++++++++++++++++++++++
1 file changed, 32 insertions(+)
diff --git a/block/qcow2-refcount.c b/block/qcow2-refcount.c
index 3c004e5bfe..3de3768a3c 100644
--- a/block/qcow2-refcount.c
+++ b/block/qcow2-refcount.c
@@ -1720,8 +1720,30 @@ static int check_refcounts_l2(BlockDriverState *bs,
BdrvCheckResult *res,
/* Mark cluster as used */
csize = (((l2_entry >> s->csize_shift) & s->csize_mask) + 1) *
BDRV_SECTOR_SIZE;
+ if (csize > s->cluster_size) {
+ ret = fix_l2_entry_to_zero(
+ bs, res, fix, l2_offset, i, active,
+ "compressed cluster larger than cluster: size 0x%"
+ PRIx64, csize);
+ if (ret < 0) {
+ goto fail;
+ }
+ continue;
+ }
+
coffset = l2_entry & s->cluster_offset_mask &
~(BDRV_SECTOR_SIZE - 1);
+ if (coffset >= bdrv_getlength(bs->file->bs)) {
+ ret = fix_l2_entry_to_zero(
+ bs, res, fix, l2_offset, i, active,
+ "compressed cluster out of file: offset 0x%" PRIx64,
+ coffset);
+ if (ret < 0) {
+ goto fail;
+ }
+ continue;
+ }
+
ret = qcow2_inc_refcounts_imrt(bs, res,
refcount_table, refcount_table_size,
coffset, csize);
@@ -1748,6 +1770,16 @@ static int check_refcounts_l2(BlockDriverState *bs,
BdrvCheckResult *res,
{
uint64_t offset = l2_entry & L2E_OFFSET_MASK;
+ if (offset >= bdrv_getlength(bs->file->bs)) {
+ ret = fix_l2_entry_to_zero(
+ bs, res, fix, l2_offset, i, active,
+ "cluster out of file: offset 0x%" PRIx64, offset);
+ if (ret < 0) {
+ goto fail;
+ }
+ continue;
+ }
+
if (flags & CHECK_FRAG_INFO) {
res->bfi.allocated_clusters++;
if (next_contiguous_offset &&
--
2.11.1
- [Qemu-devel] [PATCH 0/7] qcow2 check improvements, Vladimir Sementsov-Ogievskiy, 2018/08/17
- [Qemu-devel] [PATCH v2 3/7] block/qcow2-refcount: check_refcounts_l2: refactor compressed case, Vladimir Sementsov-Ogievskiy, 2018/08/17
- [Qemu-devel] [PATCH v2 4/7] block/qcow2-refcount: check_refcounts_l2: reduce ignored overlaps, Vladimir Sementsov-Ogievskiy, 2018/08/17
- [Qemu-devel] [PATCH v2 2/7] block/qcow2-refcount: avoid eating RAM, Vladimir Sementsov-Ogievskiy, 2018/08/17
- [Qemu-devel] [PATCH v2 1/7] block/qcow2-refcount: fix check_oflag_copied, Vladimir Sementsov-Ogievskiy, 2018/08/17
- [Qemu-devel] [PATCH v2 5/7] block/qcow2-refcount: check_refcounts_l2: split fix_l2_entry_to_zero, Vladimir Sementsov-Ogievskiy, 2018/08/17
- [Qemu-devel] [PATCH v2 6/7] block/qcow2-refcount: fix out-of-file L1 entries to be zero, Vladimir Sementsov-Ogievskiy, 2018/08/17
- [Qemu-devel] [PATCH v2 7/7] block/qcow2-refcount: fix out-of-file L2 entries to be read-as-zero,
Vladimir Sementsov-Ogievskiy <=