[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PATCH v2 2/7] block/qcow2-refcount: avoid eating RAM
From: |
Vladimir Sementsov-Ogievskiy |
Subject: |
[Qemu-block] [PATCH v2 2/7] block/qcow2-refcount: avoid eating RAM |
Date: |
Fri, 17 Aug 2018 15:22:14 +0300 |
qcow2_inc_refcounts_imrt() (through realloc_refcount_array()) can eat
an unpredictable amount of memory on corrupted table entries, which are
referencing regions far beyond the end of file.
Prevent this, by skipping such regions from further processing.
Signed-off-by: Vladimir Sementsov-Ogievskiy <address@hidden>
---
block/qcow2-refcount.c | 14 ++++++++++++++
1 file changed, 14 insertions(+)
diff --git a/block/qcow2-refcount.c b/block/qcow2-refcount.c
index 615847eb09..566c19fbfa 100644
--- a/block/qcow2-refcount.c
+++ b/block/qcow2-refcount.c
@@ -1499,12 +1499,26 @@ int qcow2_inc_refcounts_imrt(BlockDriverState *bs,
BdrvCheckResult *res,
{
BDRVQcow2State *s = bs->opaque;
uint64_t start, last, cluster_offset, k, refcount;
+ int64_t file_len;
int ret;
if (size <= 0) {
return 0;
}
+ file_len = bdrv_getlength(bs->file->bs);
+ if (file_len < 0) {
+ return file_len;
+ }
+
+ if (offset + size - file_len > s->cluster_size) {
+ fprintf(stderr, "ERROR: counting reference for region exceeding the "
+ "end of the file by more than one cluster: offset 0x%" PRIx64
+ " size 0x%" PRIx64 "\n", offset, size);
+ res->corruptions++;
+ return 0;
+ }
+
start = start_of_cluster(s, offset);
last = start_of_cluster(s, offset + size - 1);
for(cluster_offset = start; cluster_offset <= last;
--
2.11.1
- [Qemu-block] [PATCH 0/7] qcow2 check improvements, Vladimir Sementsov-Ogievskiy, 2018/08/17
- [Qemu-block] [PATCH v2 2/7] block/qcow2-refcount: avoid eating RAM,
Vladimir Sementsov-Ogievskiy <=
- [Qemu-block] [PATCH v2 1/7] block/qcow2-refcount: fix check_oflag_copied, Vladimir Sementsov-Ogievskiy, 2018/08/17
- [Qemu-block] [PATCH v2 3/7] block/qcow2-refcount: check_refcounts_l2: refactor compressed case, Vladimir Sementsov-Ogievskiy, 2018/08/17
- [Qemu-block] [PATCH v2 4/7] block/qcow2-refcount: check_refcounts_l2: reduce ignored overlaps, Vladimir Sementsov-Ogievskiy, 2018/08/17
- [Qemu-block] [PATCH v2 5/7] block/qcow2-refcount: check_refcounts_l2: split fix_l2_entry_to_zero, Vladimir Sementsov-Ogievskiy, 2018/08/17
- [Qemu-block] [PATCH v2 6/7] block/qcow2-refcount: fix out-of-file L1 entries to be zero, Vladimir Sementsov-Ogievskiy, 2018/08/17
- [Qemu-block] [PATCH v2 7/7] block/qcow2-refcount: fix out-of-file L2 entries to be read-as-zero, Vladimir Sementsov-Ogievskiy, 2018/08/17