From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37727) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WroUt-0005K7-Ex for qemu-devel@nongnu.org; Tue, 03 Jun 2014 09:11:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WroUo-0002bL-C9 for qemu-devel@nongnu.org; Tue, 03 Jun 2014 09:11:23 -0400 Received: from mx1.redhat.com ([209.132.183.28]:59722) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WroUn-0002b7-Vz for qemu-devel@nongnu.org; Tue, 03 Jun 2014 09:11:18 -0400 From: Kevin Wolf Date: Tue, 3 Jun 2014 15:10:46 +0200 Message-Id: <1401801062-9154-6-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 05/21] curl: 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 curl block driver. Signed-off-by: Kevin Wolf Reviewed-by: Stefan Hajnoczi Reviewed-by: Benoit Canet --- block/curl.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/block/curl.c b/block/curl.c index f491b0b..ae996e2 100644 --- a/block/curl.c +++ b/block/curl.c @@ -604,7 +604,13 @@ static void curl_readv_bh_cb(void *p) state->buf_start = start; state->buf_len = acb->end + s->readahead_size; end = MIN(start + state->buf_len, s->len) - 1; - state->orig_buf = g_malloc(state->buf_len); + state->orig_buf = g_try_malloc(state->buf_len); + if (state->buf_len && state->orig_buf == NULL) { + curl_clean_state(state); + acb->common.cb(acb->common.opaque, -ENOMEM); + qemu_aio_release(acb); + return; + } state->acb[0] = acb; snprintf(state->range, 127, "%zd-%zd", start, end); -- 1.8.3.1