From patchwork Tue Dec 2 07:39:15 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fam Zheng X-Patchwork-Id: 416733 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 1CD671402A9 for ; Tue, 2 Dec 2014 18:43:05 +1100 (AEDT) Received: from localhost ([::1]:35490 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xvi6x-0003PA-5c for incoming@patchwork.ozlabs.org; Tue, 02 Dec 2014 02:43:03 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49306) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xvi3S-0006n5-5V for qemu-devel@nongnu.org; Tue, 02 Dec 2014 02:39:34 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Xvi3H-0003zM-Uh for qemu-devel@nongnu.org; Tue, 02 Dec 2014 02:39:26 -0500 Received: from mx1.redhat.com ([209.132.183.28]:56315) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xvi3H-0003zF-O5 for qemu-devel@nongnu.org; Tue, 02 Dec 2014 02:39:15 -0500 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id sB27dFPK028154 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL) for ; Tue, 2 Dec 2014 02:39:15 -0500 Received: from fam-t430.nay.redhat.com (dhcp-14-161.nay.redhat.com [10.66.14.161]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id sB27csYS011783; Tue, 2 Dec 2014 02:39:12 -0500 From: Fam Zheng To: qemu-devel@nongnu.org Date: Tue, 2 Dec 2014 15:39:15 +0800 Message-Id: <1417505957-2666-5-git-send-email-famz@redhat.com> In-Reply-To: <1417505957-2666-1-git-send-email-famz@redhat.com> References: <1417505957-2666-1-git-send-email-famz@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: Kevin Wolf , Markus Armbruster , Stefan Hajnoczi Subject: [Qemu-devel] [PATCH for-2.3 4/6] vmdk: Check descriptor file length when reading it X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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 --- block/vmdk.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/block/vmdk.c b/block/vmdk.c index 0c5769c..f7c7979 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"); + return NULL; + } + size = MIN(size, 1 << 20); /* avoid unbounded allocation */ buf = g_malloc(size);