From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46151) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V5AqC-0002bH-1i for qemu-devel@nongnu.org; Fri, 02 Aug 2013 04:36:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V5A6z-0005X4-JR for qemu-devel@nongnu.org; Fri, 02 Aug 2013 03:49:31 -0400 Received: from mx1.redhat.com ([209.132.183.28]:54478) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V5A6z-0005WQ-6n for qemu-devel@nongnu.org; Fri, 02 Aug 2013 03:49:21 -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 r727nKSe025316 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Fri, 2 Aug 2013 03:49:20 -0400 From: Fam Zheng Date: Fri, 2 Aug 2013 15:48:38 +0800 Message-Id: <1375429721-15276-5-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> Subject: [Qemu-devel] [PATCH EMBARGOED 4/7] vmdk: check granularity field in opening List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Fam Zheng Granularity is used to calculate the cluster size and allocate r/w buffer. Check the value from image before using it, so we don't abort() for unbounded memory allocation. Signed-off-by: Fam Zheng --- block/vmdk.c | 13 +++++++++++++ tests/qemu-iotests/059 | 6 ++++++ 2 files changed, 19 insertions(+) diff --git a/block/vmdk.c b/block/vmdk.c index 3c6fa47..dbedff7 100644 --- a/block/vmdk.c +++ b/block/vmdk.c @@ -475,6 +475,13 @@ static int vmdk_open_vmdk3(BlockDriverState *bs, if (ret < 0) { return ret; } + + if (le32_to_cpu(header.granularity) > 0x200000) { + /* 1GB for one cluster is unrealistic */ + error_report("invalid granularity, image may be corrupt"); + return -EINVAL; + } + extent = vmdk_add_extent(bs, bs->file, false, le32_to_cpu(header.disk_sectors), @@ -561,6 +568,12 @@ static int vmdk_open_vmdk4(BlockDriverState *bs, header = footer.header; } + if (le32_to_cpu(header.granularity) > 0x200000) { + /* 1GB for one cluster is unrealistic */ + error_report("invalid granularity, image may be corrupt"); + return -EINVAL; + } + if (le32_to_cpu(header.version) >= 3) { char buf[64]; snprintf(buf, sizeof(buf), "VMDK version %d", diff --git a/tests/qemu-iotests/059 b/tests/qemu-iotests/059 index 996d85c..18807d3 100755 --- a/tests/qemu-iotests/059 +++ b/tests/qemu-iotests/059 @@ -45,6 +45,12 @@ _supported_os Linux granularity_offset=16 +echo "=== Testing invalid granularity ===" +echo +_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 + # success, all done echo "*** done" rm -f $seq.full -- 1.8.3.4