From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35439) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XRayW-0006Zq-NX for qemu-devel@nongnu.org; Wed, 10 Sep 2014 02:01:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XRayR-0003TL-MV for qemu-devel@nongnu.org; Wed, 10 Sep 2014 02:01:52 -0400 Received: from mx1.redhat.com ([209.132.183.28]:39250) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XRayR-0003TE-GF for qemu-devel@nongnu.org; Wed, 10 Sep 2014 02:01:47 -0400 From: Fam Zheng Date: Wed, 10 Sep 2014 14:00:07 +0800 Message-Id: <1410328814-12560-16-git-send-email-famz@redhat.com> In-Reply-To: <1410328814-12560-1-git-send-email-famz@redhat.com> References: <1410328814-12560-1-git-send-email-famz@redhat.com> Subject: [Qemu-devel] [PATCH v5 15/22] quorum: fix quorum_aio_cancel() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Kevin Wolf , Benoit Canet , Peter Lieven , Stefan Hajnoczi , Liu Yuan , Paolo Bonzini From: Liu Yuan For a fifo read pattern, we only have one running aio (possible other cases that has less number than num_children in the future), so we need to check if .acb is NULL against bdrv_aio_cancel() to avoid segfault. Cc: Eric Blake Cc: Benoit Canet Cc: Kevin Wolf Cc: Stefan Hajnoczi Signed-off-by: Liu Yuan Signed-off-by: Fam Zheng --- block/quorum.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/block/quorum.c b/block/quorum.c index 093382e..41c4249 100644 --- a/block/quorum.c +++ b/block/quorum.c @@ -138,7 +138,9 @@ static void quorum_aio_cancel(BlockDriverAIOCB *blockacb) /* cancel all callbacks */ for (i = 0; i < s->num_children; i++) { - bdrv_aio_cancel(acb->qcrs[i].aiocb); + if (acb->qcrs[i].aiocb) { + bdrv_aio_cancel(acb->qcrs[i].aiocb); + } } g_free(acb->qcrs); -- 1.9.3