[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 4/9] qcow2: Fix refcount blocks beyond image end
From: |
Max Reitz |
Subject: |
[Qemu-devel] [PATCH v2 4/9] qcow2: Fix refcount blocks beyond image end |
Date: |
Fri, 15 Aug 2014 17:16:21 +0200 |
If the qcow2 check function detects a refcount block located beyond the
image end, grow the image appropriately. This cannot break anything and
is the logical fix for such a case.
Signed-off-by: Max Reitz <address@hidden>
---
block/qcow2-refcount.c | 50 ++++++++++++++++++++++++++++++++++++++++++++++----
1 file changed, 46 insertions(+), 4 deletions(-)
diff --git a/block/qcow2-refcount.c b/block/qcow2-refcount.c
index c477f04..1783720 100644
--- a/block/qcow2-refcount.c
+++ b/block/qcow2-refcount.c
@@ -1504,7 +1504,8 @@ static int check_refblocks(BlockDriverState *bs,
BdrvCheckResult *res,
int64_t *nb_clusters)
{
BDRVQcowState *s = bs->opaque;
- int64_t i;
+ int64_t i, size;
+ int ret;
for(i = 0; i < s->refcount_table_size; i++) {
uint64_t offset, cluster;
@@ -1520,9 +1521,50 @@ static int check_refblocks(BlockDriverState *bs,
BdrvCheckResult *res,
}
if (cluster >= *nb_clusters) {
- fprintf(stderr, "ERROR refcount block %" PRId64
- " is outside image\n", i);
- res->corruptions++;
+ fprintf(stderr, "%s refcount block %" PRId64 " is outside image\n",
+ fix & BDRV_FIX_ERRORS ? "Repairing" : "ERROR", i);
+
+ if (fix & BDRV_FIX_ERRORS) {
+ int64_t old_nb_clusters = *nb_clusters;
+
+ ret = bdrv_truncate(bs->file, offset + s->cluster_size);
+ if (ret < 0) {
+ goto resize_fail;
+ }
+ size = bdrv_getlength(bs->file);
+ if (size < 0) {
+ ret = size;
+ goto resize_fail;
+ }
+
+ *nb_clusters = size_to_clusters(s, size);
+ assert(*nb_clusters >= old_nb_clusters);
+
+ *refcount_table = g_try_realloc(*refcount_table,
+ *nb_clusters * sizeof(uint16_t));
+ if (!*refcount_table) {
+ res->check_errors++;
+ return -ENOMEM;
+ }
+
+ memset(*refcount_table + old_nb_clusters, 0,
+ (*nb_clusters - old_nb_clusters) * sizeof(uint16_t));
+
+ if (cluster >= *nb_clusters) {
+ ret = -EINVAL;
+ goto resize_fail;
+ }
+
+ res->corruptions_fixed++;
+ continue;
+
+resize_fail:
+ res->corruptions++;
+ fprintf(stderr, "ERROR could not resize image: %s\n",
+ strerror(-ret));
+ } else {
+ res->corruptions++;
+ }
continue;
}
--
2.0.3
- [Qemu-devel] [PATCH v2 0/9] qcow2: Fix image repairing, Max Reitz, 2014/08/15
- [Qemu-devel] [PATCH v2 1/9] qcow2: Fix leaks in dirty images, Max Reitz, 2014/08/15
- [Qemu-devel] [PATCH v2 2/9] qcow2: Factor out refcount accounting for check, Max Reitz, 2014/08/15
- [Qemu-devel] [PATCH v2 3/9] qcow2: Factor out refcount comparison for check, Max Reitz, 2014/08/15
- [Qemu-devel] [PATCH v2 4/9] qcow2: Fix refcount blocks beyond image end,
Max Reitz <=
- [Qemu-devel] [PATCH v2 5/9] qcow2: Do not perform potentially damaging repairs, Max Reitz, 2014/08/15
- [Qemu-devel] [PATCH v2 6/9] qcow2: Rebuild refcount structure during check, Max Reitz, 2014/08/15
- [Qemu-devel] [PATCH v2 8/9] iotests: Fix test outputs, Max Reitz, 2014/08/15
- [Qemu-devel] [PATCH v2 9/9] iotests: Add test for potentially damaging repairs, Max Reitz, 2014/08/15
- [Qemu-devel] [PATCH v2 7/9] qcow2: Clean up after refcount rebuild, Max Reitz, 2014/08/15