From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60440) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WT74C-0002Sd-Dm for qemu-devel@nongnu.org; Thu, 27 Mar 2014 05:57:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WT747-0001V0-4B for qemu-devel@nongnu.org; Thu, 27 Mar 2014 05:57:44 -0400 Received: from mx1.redhat.com ([209.132.183.28]:23704) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WT746-0001Tj-S0 for qemu-devel@nongnu.org; Thu, 27 Mar 2014 05:57:39 -0400 From: Fam Zheng Date: Thu, 27 Mar 2014 17:09:42 +0800 Message-Id: <1395911388-31027-4-git-send-email-famz@redhat.com> In-Reply-To: <1395911388-31027-1-git-send-email-famz@redhat.com> References: <1395911388-31027-1-git-send-email-famz@redhat.com> Subject: [Qemu-devel] [PATCH v4 3/9] block: Handle error of bdrv_getlength in bdrv_create_dirty_bitmap List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Kevin Wolf , Paolo Bonzini , Benoit Canet , Stefan Hajnoczi bdrv_getlength could fail, check the return value before using it. Signed-off-by: Fam Zheng Reviewed-by: Benoit Canet --- block.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/block.c b/block.c index 3f880d6..b5265bb 100644 --- a/block.c +++ b/block.c @@ -5113,7 +5113,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); if (name) { -- 1.9.1