From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53298) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WO5hO-0004hu-6Q for qemu-devel@nongnu.org; Thu, 13 Mar 2014 09:29:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WO5hI-0007rD-ON for qemu-devel@nongnu.org; Thu, 13 Mar 2014 09:29:26 -0400 Received: from lputeaux-656-01-25-125.w80-12.abo.wanadoo.fr ([80.12.84.125]:56118 helo=paradis.irqsave.net) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WO5hI-0007r8-J3 for qemu-devel@nongnu.org; Thu, 13 Mar 2014 09:29:20 -0400 Date: Thu, 13 Mar 2014 14:29:20 +0100 From: =?iso-8859-1?Q?Beno=EEt?= Canet Message-ID: <20140313132919.GC4534@irqsave.net> References: <1394605864-32237-1-git-send-email-famz@redhat.com> <1394605864-32237-4-git-send-email-famz@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline In-Reply-To: <1394605864-32237-4-git-send-email-famz@redhat.com> Content-Transfer-Encoding: quoted-printable Subject: Re: [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: Fam Zheng Cc: kwolf@redhat.com, qemu-devel@nongnu.org, stefanha@redhat.com The Wednesday 12 Mar 2014 =E0 14:30:58 (+0800), Fam Zheng wrote : > bdrv_getlength could fail, check the return value before using it. >=20 > Signed-off-by: Fam Zheng > --- > block.c | 7 ++++++- > 1 file changed, 6 insertions(+), 1 deletion(-) >=20 > 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(BlockD= riverState *bs, > } > granularity >>=3D BDRV_SECTOR_BITS; > assert(granularity); > - bitmap_size =3D (bdrv_getlength(bs) >> BDRV_SECTOR_BITS); > + bitmap_size =3D bdrv_getlength(bs); > + if (bitmap_size < 0) { > + error_setg(errp, "could not get length of device"); > + return NULL; > + } > + bitmap_size >>=3D BDRV_SECTOR_BITS; > bitmap =3D g_malloc0(sizeof(BdrvDirtyBitmap)); > bitmap->bitmap =3D hbitmap_alloc(bitmap_size, ffs(granularity) - 1= ); > if (name) { > --=20 > 1.9.0 >=20 >=20 Reviewed-by: Benoit Canet