[v2] Add checks for corruption in the snapshot table

[Qemu-devel] [PATCH v2 0/7] Add checks for corruption in the snapshot table

Alberto Garcia posted 7 patches 7 years, 7 months ago

Diff against v1
Download series mbox

Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/qemu tags/patchew/cover.1520352600.git.berto@igalia.com

Test checkpatch passed

Test docker-build@min-glib passed

Test docker-mingw@fedora passed

Test docker-quick@centos6 passed

Test ppcbe passed

Test ppcle passed

Test s390x passed

block/qcow2-cluster.c      | 24 ++++++++++-----
block/qcow2-refcount.c     | 24 ++++++++++++++-
block/qcow2-snapshot.c     | 24 +++++++++++++--
block/qcow2.c              | 77 ++++++++++++++++++----------------------------
block/qcow2.h              | 10 +++---
tests/qemu-iotests/080     | 22 ++++++++++++-
tests/qemu-iotests/080.out | 58 ++++++++++++++++++++++++++++------
7 files changed, 166 insertions(+), 73 deletions(-)

Expand all Fold all

[Qemu-devel] [PATCH v2 0/7] Add checks for corruption in the snapshot table

Posted by Alberto Garcia 7 years, 7 months ago

Hey,

here's the new version of this series. It fixes a leak reported by
Kevin and adds a couple of error_report_err() to make use of the
message returned by qcow2_validate_table().

Regards,

Berto

Changes:

v2:
- Patch 3: Don't leak l1_table and report the error returned by
  qcow2_validate_table()
- Patch 5: Report the error returned by qcow2_validate_table().

v1: https://lists.gnu.org/archive/html/qemu-block/2018-03/msg00030.html
- Initial version

Output of backport-diff against v1:

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/7:[----] [-C] 'qcow2: Generalize validate_table_offset() into qcow2_validate_table()'
002/7:[----] [--] 'qcow2: Check L1 table offset in qcow2_snapshot_load_tmp()'
003/7:[0010] [FC] 'qcow2: Check L1 table parameters in qcow2_expand_zero_clusters()'
004/7:[----] [-C] 'qcow2: Check snapshot L1 tables in qcow2_check_metadata_overlap()'
005/7:[0007] [FC] 'qcow2: Check snapshot L1 table in qcow2_snapshot_goto()'
006/7:[----] [-C] 'qcow2: Check snapshot L1 table in qcow2_snapshot_delete()'
007/7:[----] [-C] 'qcow2: Make qemu-img check detect corrupted L1 tables in snapshots'

Alberto Garcia (7):
  qcow2: Generalize validate_table_offset() into qcow2_validate_table()
  qcow2: Check L1 table offset in qcow2_snapshot_load_tmp()
  qcow2: Check L1 table parameters in qcow2_expand_zero_clusters()
  qcow2: Check snapshot L1 tables in qcow2_check_metadata_overlap()
  qcow2: Check snapshot L1 table in qcow2_snapshot_goto()
  qcow2: Check snapshot L1 table in qcow2_snapshot_delete()
  qcow2: Make qemu-img check detect corrupted L1 tables in snapshots

 block/qcow2-cluster.c      | 24 ++++++++++-----
 block/qcow2-refcount.c     | 24 ++++++++++++++-
 block/qcow2-snapshot.c     | 24 +++++++++++++--
 block/qcow2.c              | 77 ++++++++++++++++++----------------------------
 block/qcow2.h              | 10 +++---
 tests/qemu-iotests/080     | 22 ++++++++++++-
 tests/qemu-iotests/080.out | 58 ++++++++++++++++++++++++++++------
 7 files changed, 166 insertions(+), 73 deletions(-)

-- 
2.11.0

Re: [Qemu-devel] [PATCH v2 0/7] Add checks for corruption in the snapshot table

Posted by Kevin Wolf 7 years, 7 months ago

Am 06.03.2018 um 17:14 hat Alberto Garcia geschrieben:
> Hey,
> 
> here's the new version of this series. It fixes a leak reported by
> Kevin and adds a couple of error_report_err() to make use of the
> message returned by qcow2_validate_table().

Thanks, applied to the block branch.

Kevin