From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35975) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zc6y0-0003JY-CH for qemu-devel@nongnu.org; Wed, 16 Sep 2015 03:17:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Zc6xw-0005Ht-BJ for qemu-devel@nongnu.org; Wed, 16 Sep 2015 03:17:20 -0400 Received: from [59.151.112.132] (port=5917 helo=heian.cn.fujitsu.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zc6xv-0005H1-Uf for qemu-devel@nongnu.org; Wed, 16 Sep 2015 03:17:16 -0400 From: Wen Congyang Message-ID: <55F91755.1010704@cn.fujitsu.com> Date: Wed, 16 Sep 2015 15:16:37 +0800 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Subject: [Qemu-devel] [PATCH] nbd: wait all read/write requests finished when shutdowning nbd socket List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devl , Paolo Bonzini Cc: Li Zhijian If the socket fd is shutdown, there may be some data which is received before shutdown. We will read the data and do read/write in nbd_trip(). But the exp's blk is NULL, and it will cause qemu crashed. Reported-by: Li Zhijian Signed-off-by: Wen Congyang --- nbd.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/nbd.c b/nbd.c index 06b501b..d8586a1 100644 --- a/nbd.c +++ b/nbd.c @@ -1132,6 +1132,7 @@ void nbd_export_close(NBDExport *exp) nbd_export_set_name(exp, NULL); nbd_export_put(exp); if (exp->blk) { + bdrv_drain(blk_bs(exp->blk)); blk_remove_aio_context_notifier(exp->blk, blk_aio_attached, blk_aio_detach, exp); blk_unref(exp->blk); @@ -1305,6 +1306,14 @@ static void nbd_trip(void *opaque) goto invalid_request; } + if (client->closing) { + /* + * The client may be closed when we are blocked in + * nbd_co_receive_request() + */ + goto done; + } + switch (command) { case NBD_CMD_READ: TRACE("Request type is READ"); -- 2.4.3