OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

block/iscsi: fix potential segfault on early callback

Browse Source 
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>
This commit is contained in:
Peter Lieven 2014-06-10 09:52:16 +02:00 committed by Paolo Bonzini
parent efc6de0d0e
commit fcd470d857
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
block/iscsi.c
View File

@ -144,6 +144,7 @@ iscsi_schedule_bh(IscsiAIOCB *acb)
static void iscsi_co_generic_bh_cb(void *opaque) static void iscsi_co_generic_bh_cb(void *opaque)
{ {
struct IscsiTask *iTask = opaque; struct IscsiTask *iTask = opaque;
iTask->complete = 1;
qemu_bh_delete(iTask->bh); qemu_bh_delete(iTask->bh);
qemu_coroutine_enter(iTask->co, NULL); 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) static void iscsi_retry_timer_expired(void *opaque)
{ {
struct IscsiTask *iTask = opaque; struct IscsiTask *iTask = opaque;
iTask->complete = 1;
if (iTask->co) { if (iTask->co) {
qemu_coroutine_enter(iTask->co, NULL); 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 IscsiTask *iTask = opaque;
struct scsi_task *task = command_data; struct scsi_task *task = command_data;
iTask->complete = 1;
iTask->status = status; iTask->status = status;
iTask->do_retry = 0; iTask->do_retry = 0;
iTask->task = task; iTask->task = task;
@ -205,6 +206,8 @@ out:
iTask->bh = aio_bh_new(iTask->iscsilun->aio_context, iTask->bh = aio_bh_new(iTask->iscsilun->aio_context,
iscsi_co_generic_bh_cb, iTask); iscsi_co_generic_bh_cb, iTask);
qemu_bh_schedule(iTask->bh); qemu_bh_schedule(iTask->bh);
} else {
iTask->complete = 1;
} }
} }