diff options
author | Fam Zheng <famz@redhat.com> | 2013-08-19 18:54:25 +0800 |
---|---|---|
committer | Stefan Hajnoczi <stefanha@redhat.com> | 2013-08-22 15:35:58 +0200 |
commit | b0651b8c246d0d9e6ad0831b3e34fd756016ad7e (patch) | |
tree | f2da7aad1acb3ed58813241f0413c3af1cd90a36 | |
parent | 7780d47211bde838c7f7e9330608e5397219066e (diff) | |
download | qemu-b0651b8c246d0d9e6ad0831b3e34fd756016ad7e.zip qemu-b0651b8c246d0d9e6ad0831b3e34fd756016ad7e.tar.gz qemu-b0651b8c246d0d9e6ad0831b3e34fd756016ad7e.tar.bz2 |
vmdk: Move l1_size check into vmdk_add_extent()
This header check is common to VMDK3 and VMDK4, so move it into
vmdk_add_extent().
Signed-off-by: Fam Zheng <famz@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
-rw-r--r-- | block/vmdk.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/block/vmdk.c b/block/vmdk.c index 346bb5c..f8c0a4e 100644 --- a/block/vmdk.c +++ b/block/vmdk.c @@ -401,6 +401,14 @@ static int vmdk_add_extent(BlockDriverState *bs, error_report("invalid granularity, image may be corrupt"); return -EINVAL; } + if (l1_size > 512 * 1024 * 1024) { + /* Although with big capacity and small l1_entry_sectors, we can get a + * big l1_size, we don't want unbounded value to allocate the table. + * Limit it to 512M, which is 16PB for default cluster and L2 table + * size */ + error_report("L1 size too big"); + return -EFBIG; + } s->extents = g_realloc(s->extents, (s->num_extents + 1) * sizeof(VmdkExtent)); @@ -598,14 +606,6 @@ static int vmdk_open_vmdk4(BlockDriverState *bs, } l1_size = (le64_to_cpu(header.capacity) + l1_entry_sectors - 1) / l1_entry_sectors; - if (l1_size > 512 * 1024 * 1024) { - /* although with big capacity and small l1_entry_sectors, we can get a - * big l1_size, we don't want unbounded value to allocate the table. - * Limit it to 512M, which is 16PB for default cluster and L2 table - * size */ - error_report("L1 size too big"); - return -EFBIG; - } if (le32_to_cpu(header.flags) & VMDK4_FLAG_RGD) { l1_backup_offset = le64_to_cpu(header.rgd_offset) << 9; } |