[Qemu-devel] [PATCH v6 00/11] qcow2: Fix image repairing

[Max Reitz]

As can be seen in the final patch of this series, there are certain
cases where the current repair implementation of qcow2 actually damages
the image further because it allocates new clusters for the refcount
structure which overlap with existing but according to the on-disk
refcounts (which are assumed to be wrong to begin with) unallocated
clusters.

This series fixes this by completely recreating the refcount structure
based on the in-memory information calculated during the check operation
if the possibility of damaging the image while repairing the refcount
structures in-place exists.


And thanks a lot to the reviewers so far! (and future reviewers as well,
of course)


v6:
- Patch 1: Additional comment about why
  s->refcount_block_bits = s->cluster_bits - (s->refcount_order - 3)
  [Benoît]
  (I kept Eric's R-b due to the rather trivial change)
- Patch 8:
  - Commit message: The leak will be dealt with [Eric]
  - Changed comment for alloc_clusters_imrt() according to Eric's
    (second) proposal
  - Changed a comment insode alloc_clusters_imrt() [Eric]
  - Use refblock_offset instead of rb_ofs and so on [Benoît]
  - Don't blindly use strerror(-ret), but the correct variable [Eric]
- Patch 11: Use different test number [Rebase on Kevin's block branch]


git-backport-diff against v5:

Key:
[----] : patches are identical
[####] : number of functional differences between upstream/downstream patch
[down] : patch is downstream-only
The flags [FC] indicate (F)unctional and (C)ontextual differences, respectively

001/11:[0001] [FC] 'qcow2: Calculate refcount block entry count'
002/11:[----] [--] 'qcow2: Fix leaks in dirty images'
003/11:[----] [--] 'qcow2: Split qcow2_check_refcounts()'
004/11:[----] [--] 'qcow2: Pull check_refblocks() up'
005/11:[----] [--] 'qcow2: Reuse refcount table in calculate_refcounts()'
006/11:[----] [--] 'qcow2: Fix refcount blocks beyond image end'
007/11:[----] [--] 'qcow2: Do not perform potentially damaging repairs'
008/11:[0138] [FC] 'qcow2: Rebuild refcount structure during check'
009/11:[----] [--] 'qcow2: Clean up after refcount rebuild'
010/11:[----] [-C] 'iotests: Fix test outputs'
011/11:[0004] [FC] 'iotests: Add test for potentially damaging repairs'


Max Reitz (11):
  qcow2: Calculate refcount block entry count
  qcow2: Fix leaks in dirty images
  qcow2: Split qcow2_check_refcounts()
  qcow2: Pull check_refblocks() up
  qcow2: Reuse refcount table in calculate_refcounts()
  qcow2: Fix refcount blocks beyond image end
  qcow2: Do not perform potentially damaging repairs
  qcow2: Rebuild refcount structure during check
  qcow2: Clean up after refcount rebuild
  iotests: Fix test outputs
  iotests: Add test for potentially damaging repairs

 block/qcow2-refcount.c     | 687 ++++++++++++++++++++++++++++++++-------------
 block/qcow2.c              |   5 +-
 block/qcow2.h              |   2 +
 tests/qemu-iotests/039.out |  10 +-
 tests/qemu-iotests/060.out |  10 +-
 tests/qemu-iotests/061.out |  18 +-
 tests/qemu-iotests/108     | 141 ++++++++++
 tests/qemu-iotests/108.out | 110 ++++++++
 tests/qemu-iotests/group   |   1 +
 9 files changed, 778 insertions(+), 206 deletions(-)
 create mode 100755 tests/qemu-iotests/108
 create mode 100644 tests/qemu-iotests/108.out

-- 
2.1.2