From b0604635319dbd1b8ec1b70d88bd8ea8aab86c12 Mon Sep 17 00:00:00 2001 From: Fam Zheng Date: Thu, 13 Nov 2014 04:40:21 +0100 Subject: [PATCH 18/48] vmdk: Handle failure for potentially large allocations Message-id: <1415853625-15050-4-git-send-email-famz@redhat.com> Patchwork-id: 62346 O-Subject: [RHEL-7.1 qemu-kvm-rhev PATCH v3 3/7] vmdk: Handle failure for potentially large allocations Bugzilla: 1132385 RH-Acked-by: Jeffrey Cody RH-Acked-by: Stefan Hajnoczi RH-Acked-by: Max Reitz From: Kevin Wolf Some code in the block layer makes potentially huge allocations. Failure is not completely unexpected there, so avoid aborting qemu and handle out-of-memory situations gracefully. This patch addresses the allocations in the vmdk block driver. Signed-off-by: Kevin Wolf Reviewed-by: Stefan Hajnoczi Reviewed-by: Benoit Canet (cherry picked from commit d6e5993197990ff55c660714526681fa7028299e) Signed-off-by: Fam Zheng Signed-off-by: Miroslav Rezanina --- block/vmdk.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/block/vmdk.c b/block/vmdk.c index 20d88e8..a7e5db6 100644 --- a/block/vmdk.c +++ b/block/vmdk.c @@ -456,7 +456,11 @@ static int vmdk_init_tables(BlockDriverState *bs, VmdkExtent *extent, /* read the L1 table */ l1_size = extent->l1_size * sizeof(uint32_t); - extent->l1_table = g_malloc(l1_size); + extent->l1_table = g_try_malloc(l1_size); + if (l1_size && extent->l1_table == NULL) { + return -ENOMEM; + } + ret = bdrv_pread(extent->file, extent->l1_table_offset, extent->l1_table, @@ -472,7 +476,11 @@ static int vmdk_init_tables(BlockDriverState *bs, VmdkExtent *extent, } if (extent->l1_backup_table_offset) { - extent->l1_backup_table = g_malloc(l1_size); + extent->l1_backup_table = g_try_malloc(l1_size); + if (l1_size && extent->l1_backup_table == NULL) { + ret = -ENOMEM; + goto fail_l1; + } ret = bdrv_pread(extent->file, extent->l1_backup_table_offset, extent->l1_backup_table, -- 1.8.3.1