From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58509) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WxFtS-0002Ls-FE for qemu-devel@nongnu.org; Wed, 18 Jun 2014 09:27:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WxFtM-00020k-QA for qemu-devel@nongnu.org; Wed, 18 Jun 2014 09:27:14 -0400 Received: from mail-wi0-x22c.google.com ([2a00:1450:400c:c05::22c]:46462) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WxFtM-00020Y-Bg for qemu-devel@nongnu.org; Wed, 18 Jun 2014 09:27:08 -0400 Received: by mail-wi0-f172.google.com with SMTP id hi2so7629248wib.11 for ; Wed, 18 Jun 2014 06:27:07 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Wed, 18 Jun 2014 15:26:42 +0200 Message-Id: <1403098014-1522-3-git-send-email-pbonzini@redhat.com> In-Reply-To: <1403098014-1522-1-git-send-email-pbonzini@redhat.com> References: <1403098014-1522-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PULL 02/14] block/iscsi: fix potential segfault on early callback List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Lieven From: Peter Lieven it might happen in the future that a function directly invokes its callback. In this case we end up in a segfault because the iTask is gone when the BH is scheduled. Signed-off-by: Peter Lieven Signed-off-by: Paolo Bonzini --- block/iscsi.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/block/iscsi.c b/block/iscsi.c index e64659f..09485fe 100644 --- a/block/iscsi.c +++ b/block/iscsi.c @@ -144,6 +144,7 @@ iscsi_schedule_bh(IscsiAIOCB *acb) static void iscsi_co_generic_bh_cb(void *opaque) { struct IscsiTask *iTask = opaque; + iTask->complete = 1; qemu_bh_delete(iTask->bh); qemu_coroutine_enter(iTask->co, NULL); } @@ -151,6 +152,7 @@ static void iscsi_co_generic_bh_cb(void *opaque) static void iscsi_retry_timer_expired(void *opaque) { struct IscsiTask *iTask = opaque; + iTask->complete = 1; if (iTask->co) { qemu_coroutine_enter(iTask->co, NULL); } @@ -168,7 +170,6 @@ iscsi_co_generic_cb(struct iscsi_context *iscsi, int status, struct IscsiTask *iTask = opaque; struct scsi_task *task = command_data; - iTask->complete = 1; iTask->status = status; iTask->do_retry = 0; iTask->task = task; @@ -205,6 +206,8 @@ out: iTask->bh = aio_bh_new(iTask->iscsilun->aio_context, iscsi_co_generic_bh_cb, iTask); qemu_bh_schedule(iTask->bh); + } else { + iTask->complete = 1; } } -- 1.8.3.1