From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55069) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wn9No-0001Au-28 for qemu-devel@nongnu.org; Wed, 21 May 2014 12:28:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Wn9Nh-0002Hi-Ui for qemu-devel@nongnu.org; Wed, 21 May 2014 12:28:48 -0400 Received: from mx1.redhat.com ([209.132.183.28]:21998) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wn9Nh-0002HZ-Nh for qemu-devel@nongnu.org; Wed, 21 May 2014 12:28:41 -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 s4LGSfRq006952 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 21 May 2014 12:28:41 -0400 From: Kevin Wolf Date: Wed, 21 May 2014 18:28:11 +0200 Message-Id: <1400689698-3096-14-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 13/20] 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, 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 --- 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 6586a0c..459f197 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