From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59498) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WsXql-0000iq-Ee for qemu-devel@nongnu.org; Thu, 05 Jun 2014 09:37:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WsXqf-00042e-7i for qemu-devel@nongnu.org; Thu, 05 Jun 2014 09:36:59 -0400 Received: from mx1.redhat.com ([209.132.183.28]:25070) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WsXqe-000429-Lj for qemu-devel@nongnu.org; Thu, 05 Jun 2014 09:36:53 -0400 From: Kevin Wolf Date: Thu, 5 Jun 2014 15:36:19 +0200 Message-Id: <1401975393-7255-8-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 07/21] iscsi: 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 iscsi block driver. Signed-off-by: Kevin Wolf Acked-by: Paolo Bonzini Reviewed-by: Benoit Canet Reviewed-by: Eric Blake --- block/iscsi.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/block/iscsi.c b/block/iscsi.c index 3892cc5..b3e9bdd 100644 --- a/block/iscsi.c +++ b/block/iscsi.c @@ -335,7 +335,10 @@ static int coroutine_fn iscsi_co_writev(BlockDriverState *bs, data = iov->iov[0].iov_base; } else { size_t size = MIN(nb_sectors * BDRV_SECTOR_SIZE, iov->size); - buf = g_malloc(size); + buf = g_try_malloc(size); + if (size && buf == NULL) { + return -ENOMEM; + } qemu_iovec_to_buf(iov, 0, buf, size); data = buf; } @@ -721,7 +724,12 @@ static BlockDriverAIOCB *iscsi_aio_ioctl(BlockDriverState *bs, #else struct iovec *iov = (struct iovec *)acb->ioh->dxferp; - acb->buf = g_malloc(acb->ioh->dxfer_len); + acb->buf = g_try_malloc(acb->ioh->dxfer_len); + if (acb->ioh->dxfer_len && acb->buf == NULL) { + free(acb->task); + qemu_aio_release(acb); + return NULL; + } data.data = acb->buf; data.size = iov_to_buf(iov, acb->ioh->iovec_count, 0, acb->buf, acb->ioh->dxfer_len); @@ -902,7 +910,10 @@ coroutine_fn iscsi_co_write_zeroes(BlockDriverState *bs, int64_t sector_num, nb_blocks = sector_qemu2lun(nb_sectors, iscsilun); if (iscsilun->zeroblock == NULL) { - iscsilun->zeroblock = g_malloc0(iscsilun->block_size); + iscsilun->zeroblock = g_try_malloc0(iscsilun->block_size); + if (iscsilun->zeroblock == NULL) { + return -ENOMEM; + } } iscsi_co_init_iscsitask(iscsilun, &iTask); -- 1.8.3.1