From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59681) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WsXqy-000156-GB for qemu-devel@nongnu.org; Thu, 05 Jun 2014 09:37:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WsXqp-00047m-I8 for qemu-devel@nongnu.org; Thu, 05 Jun 2014 09:37:11 -0400 Received: from mx1.redhat.com ([209.132.183.28]:65370) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WsXqp-00047W-Ah for qemu-devel@nongnu.org; Thu, 05 Jun 2014 09:37:03 -0400 From: Kevin Wolf Date: Thu, 5 Jun 2014 15:36:25 +0200 Message-Id: <1401975393-7255-14-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 13/21] raw-posix: 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 raw-posix block driver. Signed-off-by: Kevin Wolf Reviewed-by: Stefan Hajnoczi --- block/raw-posix.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/block/raw-posix.c b/block/raw-posix.c index b7f0f26..0cdf957 100644 --- a/block/raw-posix.c +++ b/block/raw-posix.c @@ -753,7 +753,11 @@ static ssize_t handle_aiocb_rw(RawPosixAIOData *aiocb) * Ok, we have to do it the hard way, copy all segments into * a single aligned buffer. */ - buf = qemu_blockalign(aiocb->bs, aiocb->aio_nbytes); + buf = qemu_try_blockalign(aiocb->bs, aiocb->aio_nbytes); + if (buf == NULL) { + return -ENOMEM; + } + if (aiocb->aio_type & QEMU_AIO_WRITE) { char *p = buf; int i; -- 1.8.3.1