From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54051) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WzTM7-0002ec-NS for qemu-devel@nongnu.org; Tue, 24 Jun 2014 12:14:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WzTLx-0006vB-Tx for qemu-devel@nongnu.org; Tue, 24 Jun 2014 12:13:59 -0400 Received: from mx1.redhat.com ([209.132.183.28]:24564) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WzTLx-0006ug-C9 for qemu-devel@nongnu.org; Tue, 24 Jun 2014 12:13:49 -0400 From: Kevin Wolf Date: Tue, 24 Jun 2014 17:37:01 +0200 Message-Id: <1403624224-2084-20-git-send-email-kwolf@redhat.com> In-Reply-To: <1403624224-2084-1-git-send-email-kwolf@redhat.com> References: <1403624224-2084-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, maxa@catit.be, 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 798d854..0dc36e0 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->file, 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