qcow2_check_convert_hdr() checks header_length only when the
compression bit is set, and only against sizeof(struct QCowHeader). A
v3 image with header_length below the fixed v3 header size is
accepted, and the header extension parser then starts at
header_length and reads the fixed header fields as extensions.

The driver used to refuse such images, but the check went under the
compression bit when zstd support was added.

Fail with -EINVAL when a v3 image has header_length below 104,
regardless of its incompatible features, as qemu does ("qcow2 header
too short").

Fixes: 66195f78dd3c ("dm-qcow2: add zstd decompression")
https://virtuozzo.atlassian.net/browse/VSTOR-152393
Feature: dm-qcow2: block device over QCOW2 files driver

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

diff --git a/drivers/md/dm-qcow2-target.c b/drivers/md/dm-qcow2-target.c
index f4004f6095a7..89c3a91f0fec 100644
--- a/drivers/md/dm-qcow2-target.c
+++ b/drivers/md/dm-qcow2-target.c
@@ -612,6 +612,9 @@ static int qcow2_check_convert_hdr(struct dm_target *ti,
        hdr->refcount_order = be32_to_cpu(raw_hdr->refcount_order);
        hdr->header_length = be32_to_cpu(raw_hdr->header_length);
 
+       if (hdr->header_length < offsetof(struct QCowHeader, compression_type))
+               return -EINVAL;
+
        is_ro = !(dm_table_get_mode(ti->table) & FMODE_WRITE);
 
 //     if (!is_ro && kernel_sets_dirty_bit !=
-- 
2.53.0

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

Reply via email to