qcow2_check_convert_hdr() returns for a v2 image before it fills in
hdr->header_length, so the field stays 0 from kzalloc().
qcow2_parse_header() uses header_length as the start of header
extensions and so parses them from offset 0 of the image, i.e. from
the header itself, instead of from offset 72 right after the v2 header.

Set header_length to the size of the v2 header before the version
check, as qemu does. v3 images overwrite it from the raw header.

https://virtuozzo.atlassian.net/browse/VSTOR-152394
Feature: dm-qcow2: block device over QCOW2 files driver

Signed-off-by: Alexander Ivanov <[email protected]>
---
 drivers/md/dm-qcow2-target.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/md/dm-qcow2-target.c b/drivers/md/dm-qcow2-target.c
index f4004f6095a7..3a3964e229e3 100644
--- a/drivers/md/dm-qcow2-target.c
+++ b/drivers/md/dm-qcow2-target.c
@@ -603,6 +603,7 @@ static int qcow2_check_convert_hdr(struct dm_target *ti,
                return -EOPNOTSUPP;
 
        hdr->refcount_order = 4;
+       hdr->header_length = offsetof(struct QCowHeader, incompatible_features);
 
        if (hdr->version == 2)
                return 0;
-- 
2.53.0

_______________________________________________
Devel mailing list
[email protected]
https://lists.openvz.org/mailman/listinfo/devel

Reply via email to