From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51767) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dfXkA-0006lk-8N for qemu-devel@nongnu.org; Wed, 09 Aug 2017 16:38:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dfXk9-0008Jm-0U for qemu-devel@nongnu.org; Wed, 09 Aug 2017 16:38:18 -0400 From: Eric Blake Date: Wed, 9 Aug 2017 15:38:04 -0500 Message-Id: <20170809203808.31725-2-eblake@redhat.com> In-Reply-To: <20170809203808.31725-1-eblake@redhat.com> References: <20170809203808.31725-1-eblake@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH v2 1/5] vpc: Check failure of bdrv_getlength() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: qemu-block@nongnu.org, kwolf@redhat.com, jcody@redhat.com, Max Reitz vpc_open() was checking for bdrv_getlength() failure in one, but not the other, location. Reported-by: Markus Armbruster Signed-off-by: Eric Blake Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Jeff Cody Reviewed-by: John Snow --- v2: error message tweak [Kevin] --- block/vpc.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/block/vpc.c b/block/vpc.c index 574879ba7c..82911ebead 100644 --- a/block/vpc.c +++ b/block/vpc.c @@ -219,6 +219,7 @@ static int vpc_open(BlockDriverState *bs, QDict *opti= ons, int flags, uint64_t pagetable_size; int disk_type =3D VHD_DYNAMIC; int ret; + int64_t bs_size; bs->file =3D bdrv_open_child(NULL, options, "file", bs, &child_file, false, errp); @@ -411,7 +412,13 @@ static int vpc_open(BlockDriverState *bs, QDict *opt= ions, int flags, } } - if (s->free_data_block_offset > bdrv_getlength(bs->file->bs)) { + bs_size =3D bdrv_getlength(bs->file->bs); + if (bs_size < 0) { + error_setg_errno(errp, -bs_size, "Unable to learn image size= "); + ret =3D bs_size; + goto fail; + } + if (s->free_data_block_offset > bs_size) { error_setg(errp, "block-vpc: free_data_block_offset points a= fter " "the end of file. The image has been trunca= ted."); ret =3D -EINVAL; --=20 2.13.4