From: "Daniel P. Berrange" <berrange@redhat.com>
To: qemu-devel@nongnu.org
Cc: qemu-block@nongnu.org, Eric Blake <eblake@redhat.com>,
Max Reitz <mreitz@redhat.com>, Kevin Wolf <kwolf@redhat.com>,
Alberto Garcia <berto@igalia.com>,
"Daniel P. Berrange" <berrange@redhat.com>
Subject: [Qemu-devel] [PATCH v7 04/20] qcow: require image size to be > 1 for new images
Date: Thu, 25 May 2017 17:38:35 +0100 [thread overview]
Message-ID: <20170525163851.8047-5-berrange@redhat.com> (raw)
In-Reply-To: <20170525163851.8047-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>
Reviewed-by: Alberto Garcia <berto@igalia.com>
Reviewed-by: Eric Blake <eblake@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 95ab123..6738bc7 100644
--- a/block/qcow.c
+++ b/block/qcow.c
@@ -811,6 +811,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 == 0) {
+ 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
next prev parent reply other threads:[~2017-05-25 16:39 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-05-25 16:38 [Qemu-devel] [PATCH v7 00/20] Convert QCow[2] to QCryptoBlock & add LUKS support Daniel P. Berrange
2017-05-25 16:38 ` [Qemu-devel] [PATCH v7 01/20] block: expose crypto option names / defs to other drivers Daniel P. Berrange
2017-05-25 16:38 ` [Qemu-devel] [PATCH v7 02/20] block: add ability to set a prefix for opt names Daniel P. Berrange
2017-05-25 19:21 ` Eric Blake
2017-05-25 16:38 ` [Qemu-devel] [PATCH v7 03/20] qcow: document another weakness of qcow AES encryption Daniel P. Berrange
2017-05-25 16:38 ` Daniel P. Berrange [this message]
2017-05-25 16:38 ` [Qemu-devel] [PATCH v7 05/20] iotests: skip 042 with qcow which dosn't support zero sized images Daniel P. Berrange
2017-05-25 16:38 ` [Qemu-devel] [PATCH v7 06/20] iotests: skip 048 with qcow which doesn't support resize Daniel P. Berrange
2017-05-25 16:38 ` [Qemu-devel] [PATCH v7 07/20] block: deprecate "encryption=on" in favor of "encrypt.format=aes" Daniel P. Berrange
2017-05-25 16:38 ` [Qemu-devel] [PATCH v7 08/20] qcow: make encrypt_sectors encrypt in place Daniel P. Berrange
2017-05-25 16:38 ` [Qemu-devel] [PATCH v7 09/20] qcow: convert QCow to use QCryptoBlock for encryption Daniel P. Berrange
2017-05-26 12:03 ` Alberto Garcia
2017-05-26 13:53 ` Daniel P. Berrange
2017-05-25 16:38 ` [Qemu-devel] [PATCH v7 10/20] qcow2: make qcow2_encrypt_sectors encrypt in place Daniel P. Berrange
2017-05-25 16:38 ` [Qemu-devel] [PATCH v7 11/20] qcow2: convert QCow2 to use QCryptoBlock for encryption Daniel P. Berrange
2017-05-26 12:07 ` Alberto Garcia
2017-05-25 16:38 ` [Qemu-devel] [PATCH v7 12/20] qcow2: extend specification to cover LUKS encryption Daniel P. Berrange
2017-05-25 19:39 ` Eric Blake
2017-05-26 13:57 ` Daniel P. Berrange
2017-05-25 16:38 ` [Qemu-devel] [PATCH v7 13/20] qcow2: add support for LUKS encryption format Daniel P. Berrange
2017-05-25 16:38 ` [Qemu-devel] [PATCH v7 14/20] qcow2: add iotests to cover LUKS encryption support Daniel P. Berrange
2017-05-25 16:38 ` [Qemu-devel] [PATCH v7 15/20] iotests: enable tests 134 and 158 to work with qcow (v1) Daniel P. Berrange
2017-05-25 16:38 ` [Qemu-devel] [PATCH v7 16/20] block: rip out all traces of password prompting Daniel P. Berrange
2017-05-25 16:38 ` [Qemu-devel] [PATCH v7 17/20] block: remove all encryption handling APIs Daniel P. Berrange
2017-05-29 13:47 ` Alberto Garcia
2017-05-25 16:38 ` [Qemu-devel] [PATCH v7 18/20] block: pass option prefix down to crypto layer Daniel P. Berrange
2017-05-25 16:38 ` [Qemu-devel] [PATCH v7 19/20] qcow2: report encryption specific image information Daniel P. Berrange
2017-05-25 19:52 ` Eric Blake
2017-05-26 14:02 ` Daniel P. Berrange
2017-05-29 9:53 ` Markus Armbruster
2017-05-30 9:16 ` Daniel P. Berrange
2017-05-25 16:38 ` [Qemu-devel] [PATCH v7 20/20] docs: document encryption options for qcow, qcow2 and luks Daniel P. Berrange
2017-05-25 19:32 ` Eric Blake
2017-05-29 13:53 ` Alberto Garcia
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=20170525163851.8047-5-berrange@redhat.com \
--to=berrange@redhat.com \
--cc=berto@igalia.com \
--cc=eblake@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).