From patchwork Fri Aug 2 07:48:39 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fam Zheng X-Patchwork-Id: 264221 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)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 5A5742C0082 for ; Fri, 2 Aug 2013 18:00:32 +1000 (EST) Received: from localhost ([::1]:45781 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V5AHl-0000fu-Ux for incoming@patchwork.ozlabs.org; Fri, 02 Aug 2013 04:00:29 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33105) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V5AHN-0000Qz-9w for qemu-devel@nongnu.org; Fri, 02 Aug 2013 04:00:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V5AHH-0000oN-8M for qemu-devel@nongnu.org; Fri, 02 Aug 2013 04:00:05 -0400 Received: from mx1.redhat.com ([209.132.183.28]:44497) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V5A70-0005Xi-SN for qemu-devel@nongnu.org; Fri, 02 Aug 2013 03:49:23 -0400 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r727nMIJ019297 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Fri, 2 Aug 2013 03:49:22 -0400 Received: from T430s.nay.redhat.com ([10.66.6.13]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id r727n0e2013079; Fri, 2 Aug 2013 03:49:21 -0400 From: Fam Zheng To: qemu-devel@nongnu.org Date: Fri, 2 Aug 2013 15:48:39 +0800 Message-Id: <1375429721-15276-6-git-send-email-famz@redhat.com> In-Reply-To: <1375429721-15276-1-git-send-email-famz@redhat.com> References: <1375429721-15276-1-git-send-email-famz@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: Fam Zheng Subject: [Qemu-devel] [PATCH EMBARGOED 5/7] vmdk: check cluster size in vmdk_open 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 VMDK specification doesn't give upper limit of cluster size (header.grainSize). But we need to avoid unbounded memory allocation. Check the value when opening and refuse too big value (>512MB cluster size). Signed-off-by: Fam Zheng --- block/vmdk.c | 1 + tests/qemu-iotests/059 | 2 +- tests/qemu-iotests/059.out | 6 ++++++ 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/block/vmdk.c b/block/vmdk.c index dbedff7..1d6bc39 100644 --- a/block/vmdk.c +++ b/block/vmdk.c @@ -41,6 +41,7 @@ #define VMDK4_GD_AT_END 0xffffffffffffffffULL #define VMDK_GTE_ZEROED 0x1 +#define VMDK_GRANULARITY_MAX 0x100000 /* limit of cluster_sectors */ /* VMDK internal error codes */ #define VMDK_OK 0 diff --git a/tests/qemu-iotests/059 b/tests/qemu-iotests/059 index 18807d3..f14c41b 100755 --- a/tests/qemu-iotests/059 +++ b/tests/qemu-iotests/059 @@ -43,7 +43,7 @@ _supported_fmt vmdk _supported_proto generic _supported_os Linux -granularity_offset=16 +granularity_offset=20 echo "=== Testing invalid granularity ===" echo diff --git a/tests/qemu-iotests/059.out b/tests/qemu-iotests/059.out index 4ca7f29..380ca3d 100644 --- a/tests/qemu-iotests/059.out +++ b/tests/qemu-iotests/059.out @@ -1,2 +1,8 @@ QA output created by 059 +=== Testing invalid granularity === + +Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864 +invalid granularity, image may be corrupt +qemu-io: can't open device TEST_DIR/t.vmdk +no file open, try 'help open' *** done