From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37816) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WroV0-0005S4-0T for qemu-devel@nongnu.org; Tue, 03 Jun 2014 09:11:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WroUu-0002ea-UD for qemu-devel@nongnu.org; Tue, 03 Jun 2014 09:11:29 -0400 Received: from mx1.redhat.com ([209.132.183.28]:26004) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WroUu-0002eT-Lt for qemu-devel@nongnu.org; Tue, 03 Jun 2014 09:11:24 -0400 From: Kevin Wolf Date: Tue, 3 Jun 2014 15:10:50 +0200 Message-Id: <1401801062-9154-10-git-send-email-kwolf@redhat.com> In-Reply-To: <1401801062-9154-1-git-send-email-kwolf@redhat.com> References: <1401801062-9154-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [PATCH v3 09/21] parallels: 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, armbru@redhat.com, stefanha@redhat.com, mreitz@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 parallels block driver. Signed-off-by: Kevin Wolf Reviewed-by: Stefan Hajnoczi Reviewed-by: Benoit Canet --- block/parallels.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/block/parallels.c b/block/parallels.c index 1a5bd35..7325678 100644 --- a/block/parallels.c +++ b/block/parallels.c @@ -105,7 +105,11 @@ static int parallels_open(BlockDriverState *bs, QDict *options, int flags, ret = -EFBIG; goto fail; } - s->catalog_bitmap = g_malloc(s->catalog_size * 4); + s->catalog_bitmap = g_try_malloc(s->catalog_size * 4); + if (s->catalog_size && s->catalog_bitmap == NULL) { + ret = -ENOMEM; + goto fail; + } ret = bdrv_pread(bs->file, 64, s->catalog_bitmap, s->catalog_size * 4); if (ret < 0) { -- 1.8.3.1