79 lines
3.1 KiB
Diff
79 lines
3.1 KiB
Diff
From 554884a1fe9a271ad78771c37e4be5a8f84258fc Mon Sep 17 00:00:00 2001
|
|
From: Maxim Levitsky <mlevitsk@redhat.com>
|
|
Date: Tue, 24 Sep 2019 21:11:50 +0100
|
|
Subject: [PATCH 2/4] block/qcow2: Fix corruption introduced by commit
|
|
8ac0f15f335
|
|
|
|
RH-Author: Maxim Levitsky <mlevitsk@redhat.com>
|
|
Message-id: <20190924211152.13461-3-mlevitsk@redhat.com>
|
|
Patchwork-id: 90878
|
|
O-Subject: [RHEL-AV-8.1.0 qemu-kvm PATCH v2 2/4] block/qcow2: Fix corruption introduced by commit 8ac0f15f335
|
|
Bugzilla: 1745922
|
|
RH-Acked-by: John Snow <jsnow@redhat.com>
|
|
RH-Acked-by: Max Reitz <mreitz@redhat.com>
|
|
RH-Acked-by: Danilo de Paula <ddepaula@redhat.com>
|
|
|
|
This fixes subtle corruption introduced by luks threaded encryption
|
|
in commit 8ac0f15f335
|
|
|
|
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1745922
|
|
|
|
The corruption happens when we do a write that
|
|
* writes to two or more unallocated clusters at once
|
|
* doesn't fully cover the first sector
|
|
* doesn't fully cover the last sector
|
|
* uses luks encryption
|
|
|
|
In this case, when allocating the new clusters we COW both areas
|
|
prior to the write and after the write, and we encrypt them.
|
|
|
|
The above mentioned commit accidentally made it so we encrypt the
|
|
second COW area using the physical cluster offset of the first area.
|
|
|
|
The problem is that offset_in_cluster in do_perform_cow_encrypt
|
|
can be larger that the cluster size, thus cluster_offset
|
|
will no longer point to the start of the cluster at which encrypted
|
|
area starts.
|
|
|
|
Next patch in this series will refactor the code to avoid all these
|
|
assumptions.
|
|
|
|
In the bugreport that was triggered by rebasing a luks image to new,
|
|
zero filled base, which lot of such writes, and causes some files
|
|
with zero areas to contain garbage there instead.
|
|
But as described above it can happen elsewhere as well
|
|
|
|
Signed-off-by: Maxim Levitsky <mlevitsk@redhat.com>
|
|
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
|
|
Message-id: 20190915203655.21638-2-mlevitsk@redhat.com
|
|
Reviewed-by: Max Reitz <mreitz@redhat.com>
|
|
Signed-off-by: Max Reitz <mreitz@redhat.com>
|
|
(cherry picked from commit 38e7d54bdc518b5a05a922467304bcace2396945)
|
|
Signed-off-by: Maxim Levitsky <mlevitsk@redhat.com>
|
|
Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
|
|
---
|
|
block/qcow2-cluster.c | 7 ++++---
|
|
1 file changed, 4 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/block/qcow2-cluster.c b/block/qcow2-cluster.c
|
|
index f2de746..11e5a92 100644
|
|
--- a/block/qcow2-cluster.c
|
|
+++ b/block/qcow2-cluster.c
|
|
@@ -473,9 +473,10 @@ static bool coroutine_fn do_perform_cow_encrypt(BlockDriverState *bs,
|
|
assert(QEMU_IS_ALIGNED(offset_in_cluster, BDRV_SECTOR_SIZE));
|
|
assert(QEMU_IS_ALIGNED(bytes, BDRV_SECTOR_SIZE));
|
|
assert(s->crypto);
|
|
- if (qcow2_co_encrypt(bs, cluster_offset,
|
|
- src_cluster_offset + offset_in_cluster,
|
|
- buffer, bytes) < 0) {
|
|
+ if (qcow2_co_encrypt(bs,
|
|
+ start_of_cluster(s, cluster_offset + offset_in_cluster),
|
|
+ src_cluster_offset + offset_in_cluster,
|
|
+ buffer, bytes) < 0) {
|
|
return false;
|
|
}
|
|
}
|
|
--
|
|
1.8.3.1
|
|
|