All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Daniel P. Berrange" <berrange@redhat.com>
To: qemu-devel@nongnu.org
Cc: qemu-block@nongnu.org, Kevin Wolf <kwolf@redhat.com>,
	Max Reitz <mreitz@redhat.com>,
	"Daniel P. Berrange" <berrange@redhat.com>
Subject: [Qemu-devel] [PATCH v2 04/17] qcow: require image size to be > 1 for new images
Date: Tue, 24 Jan 2017 14:51:39 +0000	[thread overview]
Message-ID: <20170124145152.22980-5-berrange@redhat.com> (raw)
In-Reply-To: <20170124145152.22980-1-berrange@redhat.com>

The qcow driver refuses to open images which are less than
2 bytes in size, but will happily create such images. Add
a check in the create path to avoid this discrepancy.

Reviewed-by: Max Reitz <mreitz@redhat.com>
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
---
 block/qcow.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/block/qcow.c b/block/qcow.c
index 7540f43..101c973 100644
--- a/block/qcow.c
+++ b/block/qcow.c
@@ -799,6 +799,12 @@ static int qcow_create(const char *filename, QemuOpts *opts, Error **errp)
     /* Read out options */
     total_size = ROUND_UP(qemu_opt_get_size_del(opts, BLOCK_OPT_SIZE, 0),
                           BDRV_SECTOR_SIZE);
+    if (total_size <= 1) {
+        error_setg(errp, "Image size is too small, cannot be zero length");
+        ret = -EINVAL;
+        goto cleanup;
+    }
+
     backing_file = qemu_opt_get_del(opts, BLOCK_OPT_BACKING_FILE);
     if (qemu_opt_get_bool_del(opts, BLOCK_OPT_ENCRYPT, false)) {
         flags |= BLOCK_FLAG_ENCRYPT;
-- 
2.9.3

  parent reply	other threads:[~2017-01-24 14:52 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-01-24 14:51 [Qemu-devel] [PATCH v2 00/17] Convert QCow[2] to QCryptoBlock & add LUKS support Daniel P. Berrange
2017-01-24 14:51 ` [Qemu-devel] [PATCH v2 01/17] block: expose crypto option names / defs to other drivers Daniel P. Berrange
2017-01-24 14:51 ` [Qemu-devel] [PATCH v2 02/17] block: add ability to set a prefix for opt names Daniel P. Berrange
2017-01-24 14:51 ` [Qemu-devel] [PATCH v2 03/17] qcow: document another weakness of qcow AES encryption Daniel P. Berrange
2017-01-24 14:51 ` Daniel P. Berrange [this message]
2017-01-24 14:51 ` [Qemu-devel] [PATCH v2 05/17] iotests: skip 042 with qcow which dosn't support zero sized images Daniel P. Berrange
2017-01-24 14:51 ` [Qemu-devel] [PATCH v2 06/17] iotests: skip 048 with qcow which doesn't support resize Daniel P. Berrange
2017-01-24 14:51 ` [Qemu-devel] [PATCH v2 07/17] iotests: fix 097 when run with qcow Daniel P. Berrange
2017-01-24 14:51 ` [Qemu-devel] [PATCH v2 08/17] qcow: make encrypt_sectors encrypt in place Daniel P. Berrange
2017-01-24 14:51 ` [Qemu-devel] [PATCH v2 09/17] qcow: convert QCow to use QCryptoBlock for encryption Daniel P. Berrange
2017-01-24 14:51 ` [Qemu-devel] [PATCH v2 10/17] qcow2: make qcow2_encrypt_sectors encrypt in place Daniel P. Berrange
2017-01-24 14:51 ` [Qemu-devel] [PATCH v2 11/17] qcow2: convert QCow2 to use QCryptoBlock for encryption Daniel P. Berrange
2017-01-24 14:51 ` [Qemu-devel] [PATCH v2 12/17] qcow2: extend specification to cover LUKS encryption Daniel P. Berrange
2017-01-24 14:51 ` [Qemu-devel] [PATCH v2 13/17] qcow2: add support for LUKS encryption format Daniel P. Berrange
2017-01-24 14:51 ` [Qemu-devel] [PATCH v2 14/17] qcow2: add iotests to cover LUKS encryption support Daniel P. Berrange
2017-01-24 14:51 ` [Qemu-devel] [PATCH v2 15/17] iotests: enable tests 134 and 158 to work with qcow (v1) Daniel P. Berrange
2017-01-24 14:51 ` [Qemu-devel] [PATCH v2 16/17] block: rip out all traces of password prompting Daniel P. Berrange
2017-01-24 14:51 ` [Qemu-devel] [PATCH v2 17/17] block: remove all encryption handling APIs Daniel P. Berrange

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20170124145152.22980-5-berrange@redhat.com \
    --to=berrange@redhat.com \
    --cc=kwolf@redhat.com \
    --cc=mreitz@redhat.com \
    --cc=qemu-block@nongnu.org \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.