Skip to contentSkip to conversation

qcow2: Check request size in qcow2_co_pwritev_compressed_part()

PATCH Superseded Alberto Garcia 5 participants 5 messages Apr 3, 2020 – Apr 6, 2020 Block layer

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 qcow2: Check request size in qcow2_co_pwritev_compressed_part()

When issuing a compressed write request the number of bytes must be a multiple of the cluster size.

With the current code such requests are allowed and we hit an assertion:

   $ qemu-img create -f qcow2 img.qcow2 1M
   $ qemu-io -c 'write -c 0 32k' img.qcow2

qemu-io: block/qcow2.c:4257: qcow2_co_pwritev_compressed_task:
Assertion `bytes == s->cluster_size || (bytes < s->cluster_size &&

              (offset + bytes == bs->total_sectors << BDRV_SECTOR_BITS))' failed.

Aborted

This patch fixes a regression introduced in 0d483dce38

---
 block/qcow2.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
block/qcow2.c +1 -1
index 2bb536b014..923ad428f0 100644
@@ -4345,7 +4345,7 @@ qcow2_co_pwritev_compressed_part(BlockDriverState *bs,
         return bdrv_co_truncate(bs->file, len, false, PREALLOC_MODE_OFF, NULL);
     }
 
-    if (offset_into_cluster(s, offset)) {
+    if (offset_into_cluster(s, offset | bytes)) {
         return -EINVAL;
     }
 
Signature · 1 line
2.20.1
Reviewed-by on v1 1/1
#1 lore raw
Quoted 14 lines · Alberto Garcia

When issuing a compressed write request the number of bytes must be a multiple of the cluster size.

With the current code such requests are allowed and we hit an assertion:

    $ qemu-img create -f qcow2 img.qcow2 1M
    $ qemu-io -c 'write -c 0 32k' img.qcow2
    qemu-io: block/qcow2.c:4257: qcow2_co_pwritev_compressed_task:
    Assertion `bytes == s->cluster_size || (bytes < s->cluster_size &&
               (offset + bytes == bs->total_sectors << BDRV_SECTOR_BITS))' failed.
    Aborted
Quoted 6 lines

This patch fixes a regression introduced in 0d483dce38

---
  block/qcow2.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
Quoted 15 lines
block/qcow2.c +1 -1
index 2bb536b014..923ad428f0 100644
@@ -4345,7 +4345,7 @@ qcow2_co_pwritev_compressed_part(BlockDriverState *bs,
          return bdrv_co_truncate(bs->file, len, false, PREALLOC_MODE_OFF, NULL);
      }
 
-    if (offset_into_cluster(s, offset)) {
+    if (offset_into_cluster(s, offset | bytes)) {
          return -EINVAL;
      }
 
Signature · 3 lines
Eric Blake, Principal Software Engineer
Red Hat, Inc.           +1-919-301-3226
Virtualization:  qemu.org | libvirt.org
#2 lore raw
Quoted 25 lines · Eric Blake
Quoted 14 lines · Alberto Garcia

When issuing a compressed write request the number of bytes must be a multiple of the cluster size.

With the current code such requests are allowed and we hit an assertion:

    $ qemu-img create -f qcow2 img.qcow2 1M
    $ qemu-io -c 'write -c 0 32k' img.qcow2

    qemu-io: block/qcow2.c:4257: qcow2_co_pwritev_compressed_task:
    Assertion `bytes == s->cluster_size || (bytes < s->cluster_size && (offset + bytes == bs->total_sectors << BDRV_SECTOR_BITS))' failed. Aborted

Quoted 6 lines

This patch fixes a regression introduced in 0d483dce38

---
  block/qcow2.c | 2 +-

  1 file changed, 1 insertion(+), 1 deletion(-)
Quoted 1 line
Quoted 13 lines

block/qcow2.c qcow2_co_pwritev_compressed_part(BlockDriverState *bs, · line 4350

Quoted 12 lines
block/qcow2.c +1 -1
index 2bb536b014..923ad428f0 100644
@@ -4345,7 +4345,7 @@ qcow2_co_pwritev_compressed_part(BlockDriverState *bs,
           return bdrv_co_truncate(bs->file, len, false, PREALLOC_MODE_OFF, NULL);
       }
-    if (offset_into_cluster(s, offset)) {
+    if (offset_into_cluster(s, offset | bytes)) {
           return -EINVAL;
       }
 

This will break compressed write to the tail of unaligned to cluster_size image, which is possible as I understand.

Check should make an exception for this case, like the assertion does:

len = bdrv_getlength(bs);
if (offset_into_cluster(s, offset) || (offset_into_cluster(bytes) && offset + bytes != len)) {
return -EINVAL;
}

Signature · 2 lines
Best regards,
Vladimir
#3 lore raw
In reply to Alberto Garcia
Patchew URL: https://patchew.org/QEMU/[email protected]/

Patchew URL: https://patchew.org/QEMU/[email protected]/

Hi,

This series failed the docker-quick@centos7 build test. Please find the testing commands and their output below. If you have Docker installed, you can probably reproduce it locally.

=== TEST SCRIPT BEGIN ===
#!/bin/bash
make docker-image-centos7 V=1 NETWORK=1
time make docker-test-quick@centos7 SHOW_ENV=1 J=14 NETWORK=1 === TEST SCRIPT END ===

Not run: 259
Failures: 053
Failed 1 of 116 iotests
make: *** [check-tests/check-block.sh] Error 1
make: *** Waiting for unfinished jobs....
TEST check-qtest-aarch64: tests/qtest/qos-test
Traceback (most recent call last):
---
raise CalledProcessError(retcode, cmd)
subprocess.CalledProcessError: Command '['sudo', '-n', 'docker', 'run', '--label', 'com.qemu.instance.uuid=bbedd703733d47e09453ee5d9ae135e1', '-u', '1003', '--security-opt', 'seccomp=unconfined', '--rm', '-e', 'TARGET_LIST=', '-e', 'EXTRA_CONFIGURE_OPTS=', '-e', 'V=', '-e', 'J=14', '-e', 'DEBUG=', '-e', 'SHOW_ENV=1', '-e', 'CCACHE_DIR=/var/tmp/ccache', '-v', '/home/patchew2/.cache/qemu-docker-ccache:/var/tmp/ccache:z', '-v', '/var/tmp/patchew-tester-tmp-u4oill6e/src/docker-src.2020-04-03-22.39.14.28831:/var/tmp/qemu:z,ro', 'qemu:centos7', '/var/tmp/qemu/run', 'test-quick']' returned non-zero exit status 2. filter=--filter=label=com.qemu.instance.uuid=bbedd703733d47e09453ee5d9ae135e1
make[1]: *** [docker-run] Error 1
make[1]: Leaving directory `/var/tmp/patchew-tester-tmp-u4oill6e/src'
make: *** [docker-run-test-quick@centos7] Error 2

real 14m1.546s
user 0m8.497s

The full log is available at
http://patchew.org/logs/[email protected]/testing.docker-quick@centos7/?type=message.
---
Email generated automatically by Patchew [https://patchew.org/].
Please send your feedback to [email protected]

#4 lore raw
In reply to Alberto Garcia

________________________________________
From: Alberto Garcia <[email protected]>
Sent: Friday, April 3, 2020 7:57 PM
To: [email protected]
Cc: Alberto Garcia; [email protected]; Andrey Shinkevich; Max Reitz; Kevin Wolf; Vladimir Sementsov-Ogievskiy; Pavel Butsykin
Subject: [PATCH for-5.0] qcow2: Check request size in qcow2_co_pwritev_compressed_part()

When issuing a compressed write request the number of bytes must be a multiple of the cluster size.

With the current code such requests are allowed and we hit an assertion:

   $ qemu-img create -f qcow2 img.qcow2 1M
   $ qemu-io -c 'write -c 0 32k' img.qcow2

qemu-io: block/qcow2.c:4257: qcow2_co_pwritev_compressed_task:
Assertion `bytes == s->cluster_size || (bytes < s->cluster_size &&

              (offset + bytes == bs->total_sectors << BDRV_SECTOR_BITS))' failed.

Aborted

This patch fixes a regression introduced in 0d483dce38

The condition that QEMU supports writing compressed data of the size equal to one cluster was introduced with earlier patches.

Andrey

---
 block/qcow2.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
block/qcow2.c +1 -1
index 2bb536b014..923ad428f0 100644
@@ -4345,7 +4345,7 @@ qcow2_co_pwritev_compressed_part(BlockDriverState *bs,
         return bdrv_co_truncate(bs->file, len, false, PREALLOC_MODE_OFF, NULL);
     }
 
-    if (offset_into_cluster(s, offset)) {
+    if (offset_into_cluster(s, offset | bytes)) {
         return -EINVAL;
     }
 

--
2.20.1