qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Fam Zheng <famz@redhat.com>
To: qemu-devel@nongnu.org
Cc: kwolf@redhat.com, stefanha@redhat.com
Subject: [Qemu-devel] [PATCH 5/9] block: Handle error of bdrv_getlength in bdrv_create_dirty_bitmap
Date: Mon, 13 Jan 2014 18:39:44 +0800	[thread overview]
Message-ID: <1389609588-32104-6-git-send-email-famz@redhat.com> (raw)
In-Reply-To: <1389609588-32104-1-git-send-email-famz@redhat.com>

bdrv_getlength could fail, check the return value before using it.

Signed-off-by: Fam Zheng <famz@redhat.com>
---
 block.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/block.c b/block.c
index f7e6851..cc9c530 100644
--- a/block.c
+++ b/block.c
@@ -4568,7 +4568,12 @@ BdrvDirtyBitmap *bdrv_create_dirty_bitmap(BlockDriverState *bs,
     }
     granularity >>= BDRV_SECTOR_BITS;
     assert(granularity);
-    bitmap_size = (bdrv_getlength(bs) >> BDRV_SECTOR_BITS);
+    bitmap_size = bdrv_getlength(bs);
+    if (bitmap_size < 0) {
+        error_setg(errp, "could not get length of device");
+        return NULL;
+    }
+    bitmap_size >>= BDRV_SECTOR_BITS;
     bitmap = g_malloc0(sizeof(BdrvDirtyBitmap));
     bitmap->bitmap = hbitmap_alloc(bitmap_size, ffs(granularity) - 1);
     bitmap->refcnt = 1;
-- 
1.8.5.2

  parent reply	other threads:[~2014-01-13 10:40 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-01-13 10:39 [Qemu-devel] [PATCH 0/9] QMP: Introduce incremental drive-backup with in-memory dirty bitmap Fam Zheng
2014-01-13 10:39 ` [Qemu-devel] [PATCH 1/9] block: Introduce reference count for dirty bitmaps Fam Zheng
2014-01-13 10:39 ` [Qemu-devel] [PATCH 2/9] qapi: Add optional field "name" to block dirty bitmap Fam Zheng
2014-01-17 10:22   ` Stefan Hajnoczi
2014-01-13 10:39 ` [Qemu-devel] [PATCH 3/9] block: Add bdrv_dirty_bitmap_make_anon Fam Zheng
2014-01-13 10:39 ` [Qemu-devel] [PATCH 4/9] qmp: Add dirty-bitmap-add and dirty-bitmap-remove Fam Zheng
2014-01-13 10:39 ` Fam Zheng [this message]
2014-01-13 10:39 ` [Qemu-devel] [PATCH 6/9] block: Introduce bdrv_dirty_bitmap_granularity() Fam Zheng
2014-01-13 10:39 ` [Qemu-devel] [PATCH 7/9] block: Add support of "dirty-bitmap" sync mode Fam Zheng
2014-01-13 10:39 ` [Qemu-devel] [PATCH 8/9] qmp: Add dirty-bitmap-disable command Fam Zheng
2014-01-13 10:39 ` [Qemu-devel] [PATCH 9/9] qapi: Add transaction support to dirty-bitmap-{add, disable} Fam Zheng
2014-01-17  9:25 ` [Qemu-devel] [PATCH 0/9] QMP: Introduce incremental drive-backup with in-memory dirty bitmap Stefan Hajnoczi
2014-01-20  2:55   ` Fam Zheng
2014-01-28 12:11     ` Stefan Hajnoczi

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=1389609588-32104-6-git-send-email-famz@redhat.com \
    --to=famz@redhat.com \
    --cc=kwolf@redhat.com \
    --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).