diff options
| author | Kevin Wolf <kwolf@redhat.com> | 2014-05-20 13:21:26 +0200 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2014-08-15 15:07:15 +0200 |
| commit | 7bf665ee3504ab0ca4b8c29e1f603829a8272a26 (patch) | |
| tree | 90f9fd9145d3c8e6e4dec042bd1647ba8968fcba /block | |
| parent | 857d4f46c31d2f4d57d2f0fad9dfb584262bf9b9 (diff) | |
| download | qemu-7bf665ee3504ab0ca4b8c29e1f603829a8272a26.tar.gz qemu-7bf665ee3504ab0ca4b8c29e1f603829a8272a26.tar.bz2 qemu-7bf665ee3504ab0ca4b8c29e1f603829a8272a26.zip | |
bochs: 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 bochs block driver.
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Benoit Canet <benoit@irqsave.net>
Diffstat (limited to 'block')
| -rw-r--r-- | block/bochs.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/block/bochs.c b/block/bochs.c index eba23df335..6674b27438 100644 --- a/block/bochs.c +++ b/block/bochs.c @@ -131,7 +131,11 @@ static int bochs_open(BlockDriverState *bs, QDict *options, int flags, return -EFBIG; } - 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) { + error_setg(errp, "Could not allocate memory for catalog"); + return -ENOMEM; + } ret = bdrv_pread(bs->file, le32_to_cpu(bochs.header), s->catalog_bitmap, s->catalog_size * 4); |