|
 |
9ae3a8 |
From 71930418e15b0acb825fbd02dc4f954ccdea6ece Mon Sep 17 00:00:00 2001
|
|
|
9ae3a8 |
From: Fam Zheng <famz@redhat.com>
|
|
|
9ae3a8 |
Date: Mon, 19 Aug 2013 18:54:25 +0800
|
|
|
9ae3a8 |
Subject: [PATCH 10/13] vmdk: Move l1_size check into vmdk_add_extent()
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Message-id: <1377573001-27070-11-git-send-email-famz@redhat.com>
|
|
|
9ae3a8 |
Patchwork-id: 53790
|
|
|
9ae3a8 |
O-Subject: [RHEL-7 qemu-kvm PATCH 10/13] vmdk: Move l1_size check into
|
|
|
9ae3a8 |
vmdk_add_extent()
|
|
|
9ae3a8 |
Bugzilla: 995866
|
|
|
9ae3a8 |
RH-Acked-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
|
9ae3a8 |
RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
|
|
|
9ae3a8 |
RH-Acked-by: Kevin Wolf <kwolf@redhat.com>
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
This header check is common to VMDK3 and VMDK4, so move it into
|
|
|
9ae3a8 |
vmdk_add_extent().
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Signed-off-by: Fam Zheng <famz@redhat.com>
|
|
|
9ae3a8 |
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
|
|
|
9ae3a8 |
(cherry picked from commit b0651b8c246d0d9e6ad0831b3e34fd756016ad7e)
|
|
|
9ae3a8 |
Signed-off-by: Fam Zheng <famz@redhat.com>
|
|
|
9ae3a8 |
---
|
|
|
9ae3a8 |
block/vmdk.c | 16 ++++++++--------
|
|
|
9ae3a8 |
1 files changed, 8 insertions(+), 8 deletions(-)
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
diff --git a/block/vmdk.c b/block/vmdk.c
|
|
|
9ae3a8 |
index 73d9907..4388038 100644
|
|
|
9ae3a8 |
--- a/block/vmdk.c
|
|
|
9ae3a8 |
+++ b/block/vmdk.c
|
|
|
9ae3a8 |
@@ -401,6 +401,14 @@ static int vmdk_add_extent(BlockDriverState *bs,
|
|
|
9ae3a8 |
error_report("invalid granularity, image may be corrupt");
|
|
|
9ae3a8 |
return -EINVAL;
|
|
|
9ae3a8 |
}
|
|
|
9ae3a8 |
+ if (l1_size > 512 * 1024 * 1024) {
|
|
|
9ae3a8 |
+ /* Although with big capacity and small l1_entry_sectors, we can get a
|
|
|
9ae3a8 |
+ * big l1_size, we don't want unbounded value to allocate the table.
|
|
|
9ae3a8 |
+ * Limit it to 512M, which is 16PB for default cluster and L2 table
|
|
|
9ae3a8 |
+ * size */
|
|
|
9ae3a8 |
+ error_report("L1 size too big");
|
|
|
9ae3a8 |
+ return -EFBIG;
|
|
|
9ae3a8 |
+ }
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
s->extents = g_realloc(s->extents,
|
|
|
9ae3a8 |
(s->num_extents + 1) * sizeof(VmdkExtent));
|
|
|
9ae3a8 |
@@ -598,14 +606,6 @@ static int vmdk_open_vmdk4(BlockDriverState *bs,
|
|
|
9ae3a8 |
}
|
|
|
9ae3a8 |
l1_size = (le64_to_cpu(header.capacity) + l1_entry_sectors - 1)
|
|
|
9ae3a8 |
/ l1_entry_sectors;
|
|
|
9ae3a8 |
- if (l1_size > 512 * 1024 * 1024) {
|
|
|
9ae3a8 |
- /* although with big capacity and small l1_entry_sectors, we can get a
|
|
|
9ae3a8 |
- * big l1_size, we don't want unbounded value to allocate the table.
|
|
|
9ae3a8 |
- * Limit it to 512M, which is 16PB for default cluster and L2 table
|
|
|
9ae3a8 |
- * size */
|
|
|
9ae3a8 |
- error_report("L1 size too big");
|
|
|
9ae3a8 |
- return -EFBIG;
|
|
|
9ae3a8 |
- }
|
|
|
9ae3a8 |
if (le32_to_cpu(header.flags) & VMDK4_FLAG_RGD) {
|
|
|
9ae3a8 |
l1_backup_offset = le64_to_cpu(header.rgd_offset) << 9;
|
|
|
9ae3a8 |
}
|
|
|
9ae3a8 |
--
|
|
|
9ae3a8 |
1.7.1
|
|
|
9ae3a8 |
|