From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45164) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WNch9-0003ki-L5 for qemu-devel@nongnu.org; Wed, 12 Mar 2014 02:31:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WNch1-0000Rt-3O for qemu-devel@nongnu.org; Wed, 12 Mar 2014 02:31:15 -0400 Received: from mx1.redhat.com ([209.132.183.28]:16419) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WNch0-0000Rp-S3 for qemu-devel@nongnu.org; Wed, 12 Mar 2014 02:31:07 -0400 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s2C6V5tw030340 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 12 Mar 2014 02:31:06 -0400 From: Fam Zheng Date: Wed, 12 Mar 2014 14:30:58 +0800 Message-Id: <1394605864-32237-4-git-send-email-famz@redhat.com> In-Reply-To: <1394605864-32237-1-git-send-email-famz@redhat.com> References: <1394605864-32237-1-git-send-email-famz@redhat.com> Subject: [Qemu-devel] [PATCH v2 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: kwolf@redhat.com, stefanha@redhat.com bdrv_getlength could fail, check the return value before using it. Signed-off-by: Fam Zheng --- block.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/block.c b/block.c index ce48fff..9de1385 100644 --- a/block.c +++ b/block.c @@ -5083,7 +5083,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.0