diff options
| author | Kevin Wolf <kwolf@redhat.com> | 2014-05-20 13:31:20 +0200 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2014-08-15 15:07:15 +0200 |
| commit | 2347dd7b6841c1543ceb49cb232d596eb5dd1ca3 (patch) | |
| tree | 5b06514d9f3d7de8204a884417fdfec8e178a278 | |
| parent | 4d5a3f888c7dbdd1bf892bab2a3fb5c1455ccc78 (diff) | |
| download | focaccia-qemu-2347dd7b6841c1543ceb49cb232d596eb5dd1ca3.tar.gz focaccia-qemu-2347dd7b6841c1543ceb49cb232d596eb5dd1ca3.zip | |
nfs: 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 nfs block driver. Signed-off-by: Kevin Wolf <kwolf@redhat.com> Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com> Reviewed-by: Benoit Canet <benoit@irqsave.net>
| -rw-r--r-- | block/nfs.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/block/nfs.c b/block/nfs.c index 8439e0d389..fe46c33709 100644 --- a/block/nfs.c +++ b/block/nfs.c @@ -172,7 +172,11 @@ static int coroutine_fn nfs_co_writev(BlockDriverState *bs, nfs_co_init_task(client, &task); - buf = g_malloc(nb_sectors * BDRV_SECTOR_SIZE); + buf = g_try_malloc(nb_sectors * BDRV_SECTOR_SIZE); + if (nb_sectors && buf == NULL) { + return -ENOMEM; + } + qemu_iovec_to_buf(iov, 0, buf, nb_sectors * BDRV_SECTOR_SIZE); if (nfs_pwrite_async(client->context, client->fh, |