From: Kevin Wolf <kwolf@redhat.com>
Date: Tue, 20 May 2014 11:32:14 +0000 (+0200)
Subject: parallels: Handle failure for potentially large allocations
X-Git-Tag: v2.2.0-rc0~177^2~15
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f7b593d93746ff1032a809542152212246e24fa7;p=thirdparty%2Fqemu.git

parallels: Handle failure for potentially large allocations

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 parallels block driver.

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Benoit Canet <benoit@irqsave.net>
---

diff --git a/block/parallels.c b/block/parallels.c
index 1a5bd350b3c..7325678a4d6 100644
--- a/block/parallels.c
+++ b/block/parallels.c
@@ -105,7 +105,11 @@ static int parallels_open(BlockDriverState *bs, QDict *options, int flags,
         ret = -EFBIG;
         goto fail;
     }
-    s->catalog_bitmap = g_malloc(s->catalog_size * 4);
+    s->catalog_bitmap = g_try_malloc(s->catalog_size * 4);
+    if (s->catalog_size && s->catalog_bitmap == NULL) {
+        ret = -ENOMEM;
+        goto fail;
+    }
 
     ret = bdrv_pread(bs->file, 64, s->catalog_bitmap, s->catalog_size * 4);
     if (ret < 0) {