From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59517) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WsXqn-0000lG-Bv for qemu-devel@nongnu.org; Thu, 05 Jun 2014 09:37:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WsXqg-00043Y-Td for qemu-devel@nongnu.org; Thu, 05 Jun 2014 09:37:01 -0400 Received: from mx1.redhat.com ([209.132.183.28]:36117) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WsXqg-00043L-ME for qemu-devel@nongnu.org; Thu, 05 Jun 2014 09:36:54 -0400 From: Kevin Wolf Date: Thu, 5 Jun 2014 15:36:20 +0200 Message-Id: <1401975393-7255-9-git-send-email-kwolf@redhat.com> In-Reply-To: <1401975393-7255-1-git-send-email-kwolf@redhat.com> References: <1401975393-7255-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [PATCH v4 08/21] nfs: Handle failure for potentially large allocations List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, benoit.canet@irqsave.net, stefanha@redhat.com 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 Reviewed-by: Stefan Hajnoczi Reviewed-by: Benoit Canet --- 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