Re: [Qemu-devel] [PATCH v2 09/20] parallels: Handle failure for potentially large allocations

[Benoît Canet]

The Wednesday 28 May 2014 à 16:37:42 (+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 parallels block driver.
> 
> Signed-off-by: Kevin Wolf <address@hidden>
> Reviewed-by: Stefan Hajnoczi <address@hidden>
> ---
>  block/parallels.c | 6 +++++-
>  1 file changed, 5 insertions(+), 1 deletion(-)
> 
> diff --git a/block/parallels.c b/block/parallels.c
> index 1a5bd35..7325678 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) {
> -- 
> 1.8.3.1
> 
> 

Reviewed-by: Benoit Canet <address@hidden>