qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Kevin Wolf <kwolf@redhat.com>
To: qemu-block@nongnu.org
Cc: kwolf@redhat.com, stefanha@redhat.com, peter.maydell@linaro.org,
	qemu-devel@nongnu.org
Subject: [Qemu-devel] [PULL 4/7] qcow2: Check failure of bdrv_getlength()
Date: Fri, 11 Aug 2017 16:05:33 +0200	[thread overview]
Message-ID: <20170811140536.2792-5-kwolf@redhat.com> (raw)
In-Reply-To: <20170811140536.2792-1-kwolf@redhat.com>

From: Eric Blake <eblake@redhat.com>

qcow2_co_pwritev_compressed() should not call bdrv_truncate()
if determining the size failed.

Reported-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Jeff Cody <jcody@redhat.com>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: John Snow <jsnow@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 block/qcow2.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/block/qcow2.c b/block/qcow2.c
index 99407403ea..40ba26c111 100644
--- a/block/qcow2.c
+++ b/block/qcow2.c
@@ -3282,12 +3282,15 @@ qcow2_co_pwritev_compressed(BlockDriverState *bs, uint64_t offset,
     z_stream strm;
     int ret, out_len;
     uint8_t *buf, *out_buf;
-    uint64_t cluster_offset;
+    int64_t cluster_offset;
 
     if (bytes == 0) {
         /* align end of file to a sector boundary to ease reading with
            sector based I/Os */
         cluster_offset = bdrv_getlength(bs->file->bs);
+        if (cluster_offset < 0) {
+            return cluster_offset;
+        }
         return bdrv_truncate(bs->file, cluster_offset, PREALLOC_MODE_OFF, NULL);
     }
 
-- 
2.13.4

  parent reply	other threads:[~2017-08-11 14:06 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-08-11 14:05 [Qemu-devel] [PULL 0/7] Block/Multiboot patches for 2.10.0-rc3 Kevin Wolf
2017-08-11 14:05 ` [Qemu-devel] [PULL 1/7] tests/multiboot: Fix whitespace failure Kevin Wolf
2017-08-11 14:05 ` [Qemu-devel] [PULL 2/7] vpc: Check failure of bdrv_getlength() Kevin Wolf
2017-08-11 14:05 ` [Qemu-devel] [PULL 3/7] qcow2: Drop debugging dump_refcounts() Kevin Wolf
2017-08-11 14:05 ` Kevin Wolf [this message]
2017-08-11 14:05 ` [Qemu-devel] [PULL 5/7] osdep: Add runtime OFD lock detection Kevin Wolf
2017-08-11 14:05 ` [Qemu-devel] [PULL 6/7] file-posix: Do runtime check for ofd lock API Kevin Wolf
2017-08-11 14:05 ` [Qemu-devel] [PULL 7/7] qemu-iotests: fix 185 Kevin Wolf
2017-08-11 17:10 ` [Qemu-devel] [PULL 0/7] Block/Multiboot patches for 2.10.0-rc3 Peter Maydell
2017-08-11 18:00   ` Peter Maydell

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=20170811140536.2792-5-kwolf@redhat.com \
    --to=kwolf@redhat.com \
    --cc=peter.maydell@linaro.org \
    --cc=qemu-block@nongnu.org \
    --cc=qemu-devel@nongnu.org \
    --cc=stefanha@redhat.com \
    /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).