From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59768) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WsXr5-0001IH-Kf for qemu-devel@nongnu.org; Thu, 05 Jun 2014 09:37:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WsXqz-0004Ba-Lr for qemu-devel@nongnu.org; Thu, 05 Jun 2014 09:37:19 -0400 Received: from mx1.redhat.com ([209.132.183.28]:3315) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WsXqz-0004BM-Ec for qemu-devel@nongnu.org; Thu, 05 Jun 2014 09:37:13 -0400 From: Kevin Wolf Date: Thu, 5 Jun 2014 15:36:31 +0200 Message-Id: <1401975393-7255-20-git-send-email-kwolf@redhat.com> In-Reply-To: <1401975393-7255-1-git-send-email-kwolf@redhat.com> References: <1401975393-7255-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [PATCH v4 19/21] vpc: 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, stefanha@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 vpc block driver. Signed-off-by: Kevin Wolf Reviewed-by: Stefan Hajnoczi Reviewed-by: Benoit Canet --- block/vpc.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/block/vpc.c b/block/vpc.c index 2e25f57..a6346bb 100644 --- a/block/vpc.c +++ b/block/vpc.c @@ -269,7 +269,11 @@ static int vpc_open(BlockDriverState *bs, QDict *options, int flags, goto fail; } - s->pagetable = qemu_blockalign(bs, s->max_table_entries * 4); + s->pagetable = qemu_try_blockalign(bs, s->max_table_entries * 4); + if (s->pagetable == NULL) { + ret = -ENOMEM; + goto fail; + } s->bat_offset = be64_to_cpu(dyndisk_header->table_offset); -- 1.8.3.1