The Wednesday 28 May 2014 à 16:37:36 (+0200), Kevin Wolf wrote :
> 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 <kw...@redhat.com>
> Reviewed-by: Stefan Hajnoczi <stefa...@redhat.com>
> ---
> block/bochs.c | 6 +++++-
> 1 file changed, 5 insertions(+), 1 deletion(-)
>
> diff --git a/block/bochs.c b/block/bochs.c
> index eba23df..6674b27 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);
> --
> 1.8.3.1
>
>
Reviewed-by: Benoit Canet <ben...@irqsave.net>
