From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36027) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aHArm-0007Do-ED for qemu-devel@nongnu.org; Thu, 07 Jan 2016 08:44:39 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aHArl-00031S-Dr for qemu-devel@nongnu.org; Thu, 07 Jan 2016 08:44:38 -0500 From: Paolo Bonzini Date: Thu, 7 Jan 2016 14:44:26 +0100 Message-Id: <1452174266-11594-3-git-send-email-pbonzini@redhat.com> In-Reply-To: <1452174266-11594-1-git-send-email-pbonzini@redhat.com> References: <1452174266-11594-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH 2/2] nbd: do not exit on failed memory allocation List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, sitsofe@yahoo.com, qemu-block@nongnu.org, mreitz@redhat.com The amount of memory allocated in nbd_co_receive_request is driven by the NBD client (possibly a virtual machine). Parallel I/O can cause the server to allocate a large amount of memory; check for failures and return ENOMEM in that case. Signed-off-by: Paolo Bonzini --- block/block-backend.c | 5 +++++ include/sysemu/block-backend.h | 1 + nbd.c | 6 +++++- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/block/block-backend.c b/block/block-backend.c index f41d326..e813759 100644 --- a/block/block-backend.c +++ b/block/block-backend.c @@ -1033,6 +1033,11 @@ void blk_set_guest_block_size(BlockBackend *blk, int align) blk->guest_block_size = align; } +void *blk_try_blockalign(BlockBackend *blk, size_t size) +{ + return qemu_try_blockalign(blk ? blk->bs : NULL, size); +} + void *blk_blockalign(BlockBackend *blk, size_t size) { return qemu_blockalign(blk ? blk->bs : NULL, size); diff --git a/include/sysemu/block-backend.h b/include/sysemu/block-backend.h index dc24476..1568554 100644 --- a/include/sysemu/block-backend.h +++ b/include/sysemu/block-backend.h @@ -148,6 +148,7 @@ int blk_get_flags(BlockBackend *blk); int blk_get_max_transfer_length(BlockBackend *blk); int blk_get_max_iov(BlockBackend *blk); void blk_set_guest_block_size(BlockBackend *blk, int align); +void *blk_try_blockalign(BlockBackend *blk, size_t size); void *blk_blockalign(BlockBackend *blk, size_t size); bool blk_op_is_blocked(BlockBackend *blk, BlockOpType op, Error **errp); void blk_op_unblock(BlockBackend *blk, BlockOpType op, Error *reason); diff --git a/nbd.c b/nbd.c index e395a16..7dc58a9 100644 --- a/nbd.c +++ b/nbd.c @@ -1245,7 +1245,11 @@ static ssize_t nbd_co_receive_request(NBDRequest *req, struct nbd_request *reque goto out; } - req->data = blk_blockalign(client->exp->blk, request->len); + req->data = blk_try_blockalign(client->exp->blk, request->len); + if (req->data == NULL) { + rc = -ENOMEM; + goto out; + } } if (command == NBD_CMD_WRITE) { TRACE("Reading %u byte(s)", request->len); -- 2.5.0