From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53257) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XwAkp-0004Rs-0Y for qemu-devel@nongnu.org; Wed, 03 Dec 2014 09:18:13 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XwAkg-0001nm-80 for qemu-devel@nongnu.org; Wed, 03 Dec 2014 09:18:06 -0500 Received: from mx1.redhat.com ([209.132.183.28]:47298) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XwAkg-0001ng-0b for qemu-devel@nongnu.org; Wed, 03 Dec 2014 09:17:58 -0500 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id sB3EHu3G008693 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL) for ; Wed, 3 Dec 2014 09:17:57 -0500 Message-ID: <547F1B92.5080107@redhat.com> Date: Wed, 03 Dec 2014 15:17:54 +0100 From: Max Reitz MIME-Version: 1.0 References: <1417602521-14482-1-git-send-email-famz@redhat.com> <1417602521-14482-5-git-send-email-famz@redhat.com> In-Reply-To: <1417602521-14482-5-git-send-email-famz@redhat.com> Content-Type: text/plain; charset=iso-8859-15; format=flowed Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH v3 4/6] vmdk: Check descriptor file length when reading it List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Fam Zheng , qemu-devel@nongnu.org Cc: Kevin Wolf , Markus Armbruster , Stefan Hajnoczi On 2014-12-03 at 11:28, Fam Zheng wrote: > Since a too small file cannot be a valid VMDK image, and also since the > buffer's first 4 bytes will be unconditionally examined by > vmdk_open_sparse, let's error out the small file case to be clear. > > Signed-off-by: Fam Zheng > Reviewed-by: Markus Armbruster > --- > block/vmdk.c | 5 +++++ > 1 file changed, 5 insertions(+) > > diff --git a/block/vmdk.c b/block/vmdk.c > index 82257cd..045fd7a 100644 > --- a/block/vmdk.c > +++ b/block/vmdk.c > @@ -557,6 +557,11 @@ static char *vmdk_read_desc(BlockDriverState *file, uint64_t desc_offset, > return NULL; > } > > + if (size < 4) { > + error_setg_errno(errp, -size, "File is too small, not a valid image"); 0 <= size < 4, strerror(0..-3) doesn't make a whole lot of sense. Should be simply error_setg() instead of error_setg_errno(). Max > + return NULL; > + } > + > size = MIN(size, (1 << 20) - 1); /* avoid unbounded allocation */ > buf = g_malloc(size + 1); >