From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38011) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WroVF-0005vt-F1 for qemu-devel@nongnu.org; Tue, 03 Jun 2014 09:11:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WroV9-0002ke-3r for qemu-devel@nongnu.org; Tue, 03 Jun 2014 09:11:45 -0400 Received: from mx1.redhat.com ([209.132.183.28]:63421) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WroV8-0002j7-Sa for qemu-devel@nongnu.org; Tue, 03 Jun 2014 09:11:39 -0400 From: Kevin Wolf Date: Tue, 3 Jun 2014 15:10:59 +0200 Message-Id: <1401801062-9154-19-git-send-email-kwolf@redhat.com> In-Reply-To: <1401801062-9154-1-git-send-email-kwolf@redhat.com> References: <1401801062-9154-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [PATCH v3 18/21] vmdk: Handle failure for potentially large allocations List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, benoit.canet@irqsave.net, armbru@redhat.com, stefanha@redhat.com, mreitz@redhat.com 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 --- block/vmdk.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/block/vmdk.c b/block/vmdk.c index 2b38f61..fd81b1f 100644 --- a/block/vmdk.c +++ b/block/vmdk.c @@ -448,7 +448,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, @@ -464,7 +468,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