[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 06/20] dmg: Handle failure for potentially large all
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [PATCH 06/20] dmg: Handle failure for potentially large allocations |
Date: |
Wed, 21 May 2014 18:28:04 +0200 |
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 dmg block driver.
Signed-off-by: Kevin Wolf <address@hidden>
---
block/dmg.c | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/block/dmg.c b/block/dmg.c
index 1e153cd..75bdc21 100644
--- a/block/dmg.c
+++ b/block/dmg.c
@@ -284,8 +284,15 @@ static int dmg_open(BlockDriverState *bs, QDict *options,
int flags,
}
/* initialize zlib engine */
- s->compressed_chunk = g_malloc(max_compressed_size + 1);
- s->uncompressed_chunk = g_malloc(512 * max_sectors_per_chunk);
+ s->compressed_chunk = qemu_try_blockalign(bs->file,
+ max_compressed_size + 1);
+ s->uncompressed_chunk = qemu_try_blockalign(bs->file,
+ 512 * max_sectors_per_chunk);
+ if (s->compressed_chunk == NULL || s->uncompressed_chunk == NULL) {
+ ret = -ENOMEM;
+ goto fail;
+ }
+
if (inflateInit(&s->zstream) != Z_OK) {
ret = -EINVAL;
goto fail;
--
1.8.3.1
- [Qemu-devel] [PATCH 01/20] block: Introduce qemu_try_blockalign(), (continued)
- [Qemu-devel] [PATCH 01/20] block: Introduce qemu_try_blockalign(), Kevin Wolf, 2014/05/21
- [Qemu-devel] [PATCH 03/20] bochs: Handle failure for potentially large allocations, Kevin Wolf, 2014/05/21
- [Qemu-devel] [PATCH 04/20] cloop: Handle failure for potentially large allocations, Kevin Wolf, 2014/05/21
- [Qemu-devel] [PATCH 02/20] block: Handle failure for potentially large allocations, Kevin Wolf, 2014/05/21
- [Qemu-devel] [PATCH 05/20] curl: Handle failure for potentially large allocations, Kevin Wolf, 2014/05/21
- [Qemu-devel] [PATCH 06/20] dmg: Handle failure for potentially large allocations,
Kevin Wolf <=
- [Qemu-devel] [PATCH 07/20] iscsi: Handle failure for potentially large allocations, Kevin Wolf, 2014/05/21
- [Qemu-devel] [PATCH 09/20] parallels: Handle failure for potentially large allocations, Kevin Wolf, 2014/05/21
- [Qemu-devel] [PATCH 08/20] nfs: Handle failure for potentially large allocations, Kevin Wolf, 2014/05/21
- [Qemu-devel] [PATCH 10/20] qcow1: Handle failure for potentially large allocations, Kevin Wolf, 2014/05/21