[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v4 08/21] nfs: Handle failure for potentially large
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [PATCH v4 08/21] nfs: Handle failure for potentially large allocations |
Date: |
Thu, 5 Jun 2014 15:36:20 +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 nfs block driver.
Signed-off-by: Kevin Wolf <address@hidden>
Reviewed-by: Stefan Hajnoczi <address@hidden>
Reviewed-by: Benoit Canet <address@hidden>
---
block/nfs.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/block/nfs.c b/block/nfs.c
index 539bd95..b37316f 100644
--- a/block/nfs.c
+++ b/block/nfs.c
@@ -165,7 +165,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,
--
1.8.3.1
- [Qemu-devel] [PATCH v4 00/21] block: Handle failure for potentially large allocations, Kevin Wolf, 2014/06/05
- [Qemu-devel] [PATCH v4 01/21] block: Introduce qemu_try_blockalign(), Kevin Wolf, 2014/06/05
- [Qemu-devel] [PATCH v4 03/21] bochs: Handle failure for potentially large allocations, Kevin Wolf, 2014/06/05
- [Qemu-devel] [PATCH v4 02/21] block: Handle failure for potentially large allocations, Kevin Wolf, 2014/06/05
- [Qemu-devel] [PATCH v4 04/21] cloop: Handle failure for potentially large allocations, Kevin Wolf, 2014/06/05
- [Qemu-devel] [PATCH v4 05/21] curl: Handle failure for potentially large allocations, Kevin Wolf, 2014/06/05
- [Qemu-devel] [PATCH v4 06/21] dmg: Handle failure for potentially large allocations, Kevin Wolf, 2014/06/05
- [Qemu-devel] [PATCH v4 07/21] iscsi: Handle failure for potentially large allocations, Kevin Wolf, 2014/06/05
- [Qemu-devel] [PATCH v4 08/21] nfs: Handle failure for potentially large allocations,
Kevin Wolf <=
- [Qemu-devel] [PATCH v4 09/21] parallels: Handle failure for potentially large allocations, Kevin Wolf, 2014/06/05
- [Qemu-devel] [PATCH v4 10/21] qcow1: Handle failure for potentially large allocations, Kevin Wolf, 2014/06/05
- [Qemu-devel] [PATCH v4 12/21] qed: Handle failure for potentially large allocations, Kevin Wolf, 2014/06/05
- [Qemu-devel] [PATCH v4 11/21] qcow2: Handle failure for potentially large allocations, Kevin Wolf, 2014/06/05
- [Qemu-devel] [PATCH v4 13/21] raw-posix: Handle failure for potentially large allocations, Kevin Wolf, 2014/06/05