From 46415e245ed90b1bb08ff4d67559a6c0f34cf9db Mon Sep 17 00:00:00 2001 From: Jeffrey Cody Date: Wed, 29 Jul 2015 16:59:53 +0200 Subject: [PATCH 02/13] vpc: Handle failure for potentially large allocations Message-id: Patchwork-id: 67196 O-Subject: [RHEL-7.2 qemu-kvm PATCH 1/3] vpc: Handle failure for potentially large allocations Bugzilla: 1217349 RH-Acked-by: Laszlo Ersek 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 vpc block driver. Signed-off-by: Kevin Wolf Reviewed-by: Stefan Hajnoczi Reviewed-by: Benoit Canet (cherry picked from commit 5fb09cd5867aabf26d5b85b0913dccd496b71421) Signed-off-by: Jeff Cody Signed-off-by: Miroslav Rezanina --- block/vpc.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/block/vpc.c b/block/vpc.c index 849501a..6fdce40 100644 --- a/block/vpc.c +++ b/block/vpc.c @@ -260,7 +260,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