Skip to content

Commit

Permalink
block/iscsi: fix potential segfault on early callback
Browse files Browse the repository at this point in the history
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 <pl@kamp.de>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
  • Loading branch information
plieven authored and bonzini committed Jun 18, 2014
1 parent efc6de0 commit fcd470d
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion block/iscsi.c
Expand Up @@ -144,13 +144,15 @@ 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);
}

static void iscsi_retry_timer_expired(void *opaque)
{
struct IscsiTask *iTask = opaque;
iTask->complete = 1;
if (iTask->co) {
qemu_coroutine_enter(iTask->co, NULL);
}
Expand All @@ -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;
Expand Down Expand Up @@ -205,6 +206,8 @@ iscsi_co_generic_cb(struct iscsi_context *iscsi, int status,
iTask->bh = aio_bh_new(iTask->iscsilun->aio_context,
iscsi_co_generic_bh_cb, iTask);
qemu_bh_schedule(iTask->bh);
} else {
iTask->complete = 1;
}
}

Expand Down

0 comments on commit fcd470d

Please sign in to comment.