From patchwork Fri Aug 2 07:48:40 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fam Zheng X-Patchwork-Id: 264352 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 04E822C0095 for ; Sat, 3 Aug 2013 07:39:26 +1000 (EST) Received: from localhost ([::1]:45792 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V5N4F-0004Jl-A9 for incoming@patchwork.ozlabs.org; Fri, 02 Aug 2013 17:39:23 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33468) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V5N3u-0004Iv-Kh for qemu-devel@nongnu.org; Fri, 02 Aug 2013 17:39:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V5N3q-0002sX-Ed for qemu-devel@nongnu.org; Fri, 02 Aug 2013 17:39:02 -0400 Received: from mx1.redhat.com ([209.132.183.28]:26498) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V5A72-0005YT-QN for qemu-devel@nongnu.org; Fri, 02 Aug 2013 03:49:25 -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 r727nOMQ019311 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Fri, 2 Aug 2013 03:49:24 -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 r727n0e3013079; Fri, 2 Aug 2013 03:49:22 -0400 From: Fam Zheng To: qemu-devel@nongnu.org Date: Fri, 2 Aug 2013 15:48:40 +0800 Message-Id: <1375429721-15276-7-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 6/7] vmdk: check l2 table size when opening 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 header.num_gtes_per_gte determines size for L2 table. Check for too big value before using it. Limit to 512M entries (2GB per one L2 table). Signed-off-by: Fam Zheng --- block/vmdk.c | 5 +++++ tests/qemu-iotests/059 | 7 +++++++ tests/qemu-iotests/059.out | 6 ++++++ 3 files changed, 18 insertions(+) diff --git a/block/vmdk.c b/block/vmdk.c index 1d6bc39..e28bfc8 100644 --- a/block/vmdk.c +++ b/block/vmdk.c @@ -584,6 +584,11 @@ static int vmdk_open_vmdk4(BlockDriverState *bs, return -ENOTSUP; } + if (le64_to_cpu(header.num_gtes_per_gte) > 512 * 1024 * 1024) { + error_report("L2 table size too big"); + return -EINVAL; + } + l1_entry_sectors = le32_to_cpu(header.num_gtes_per_gte) * le64_to_cpu(header.granularity); if (l1_entry_sectors == 0) { diff --git a/tests/qemu-iotests/059 b/tests/qemu-iotests/059 index f14c41b..aa9eb57 100755 --- a/tests/qemu-iotests/059 +++ b/tests/qemu-iotests/059 @@ -44,6 +44,7 @@ _supported_proto generic _supported_os Linux granularity_offset=20 +grain_table_size_offset=44 echo "=== Testing invalid granularity ===" echo @@ -51,6 +52,12 @@ _make_test_img 64M poke_file "$TEST_IMG" "$granularity_offset" "\xff\xff\xff\xff\xff\xff\xff\xff" $QEMU_IO -c "read 0 512" $TEST_IMG 2>&1 | _filter_qemu_io | _filter_testdir +echo "=== Testing too big L2 table size ===" +echo +_make_test_img 64M +poke_file "$TEST_IMG" "$grain_table_size_offset" "\xff\xff\xff\xff" +$QEMU_IO -c "read 0 512" $TEST_IMG 2>&1 | _filter_qemu_io | _filter_testdir + # success, all done echo "*** done" rm -f $seq.full diff --git a/tests/qemu-iotests/059.out b/tests/qemu-iotests/059.out index 380ca3d..583955f 100644 --- a/tests/qemu-iotests/059.out +++ b/tests/qemu-iotests/059.out @@ -5,4 +5,10 @@ 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' +=== Testing too big L2 table size === + +Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864 +L2 table size too big +qemu-io: can't open device TEST_DIR/t.vmdk +no file open, try 'help open' *** done