From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55009) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wn9Nj-00010m-8L for qemu-devel@nongnu.org; Wed, 21 May 2014 12:28:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Wn9Nd-0002FF-0l for qemu-devel@nongnu.org; Wed, 21 May 2014 12:28:43 -0400 Received: from mx1.redhat.com ([209.132.183.28]:57566) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wn9Nc-0002Eg-Mk for qemu-devel@nongnu.org; Wed, 21 May 2014 12:28:36 -0400 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s4LGSXpP006917 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 21 May 2014 12:28:34 -0400 From: Kevin Wolf Date: Wed, 21 May 2014 18:28:06 +0200 Message-Id: <1400689698-3096-9-git-send-email-kwolf@redhat.com> In-Reply-To: <1400689698-3096-1-git-send-email-kwolf@redhat.com> References: <1400689698-3096-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [PATCH 08/20] 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, 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 --- block/nfs.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/block/nfs.c b/block/nfs.c index 539bd95..e3d6216 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 (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