From patchwork Wed May 28 14:37:46 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Wolf X-Patchwork-Id: 353470 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 9B81D14009C for ; Thu, 29 May 2014 00:43:42 +1000 (EST) Received: from localhost ([::1]:42606 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wpf4t-00088o-FO for incoming@patchwork.ozlabs.org; Wed, 28 May 2014 10:43:39 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49722) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wpezp-0006zV-6C for qemu-devel@nongnu.org; Wed, 28 May 2014 10:38:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Wpezh-0005Xz-GO for qemu-devel@nongnu.org; Wed, 28 May 2014 10:38:25 -0400 Received: from mx1.redhat.com ([209.132.183.28]:29338) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wpezh-0005Xq-8O for qemu-devel@nongnu.org; Wed, 28 May 2014 10:38:17 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s4SEcGud010726 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Wed, 28 May 2014 10:38:16 -0400 Received: from noname.str.redhat.com (dhcp-192-197.str.redhat.com [10.33.192.197]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id s4SEc0Eb018268; Wed, 28 May 2014 10:38:15 -0400 From: Kevin Wolf To: qemu-devel@nongnu.org Date: Wed, 28 May 2014 16:37:46 +0200 Message-Id: <1401287873-25805-14-git-send-email-kwolf@redhat.com> In-Reply-To: <1401287873-25805-1-git-send-email-kwolf@redhat.com> References: <1401287873-25805-1-git-send-email-kwolf@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: kwolf@redhat.com, stefanha@redhat.com Subject: [Qemu-devel] [PATCH v2 13/20] raw-posix: Handle failure for potentially large allocations X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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;