Message ID | 1393071444-29556-1-git-send-email-pl@kamp.de |
---|---|
State | New |
Headers | show |
Il 22/02/2014 13:17, Peter Lieven ha scritto: > commit fa6252b0 introduced a segfault because it tries > to read iTask.task->sense after iTask.task has been > freed. > > CC: qemu-stable@nongnu.org Not needed, it's not in the 1.7.1 pending release. Applied to scsi-next, thanks. Paolo > Signed-off-by: Peter Lieven <pl@kamp.de> > --- > block/iscsi.c | 17 +++++++++-------- > 1 file changed, 9 insertions(+), 8 deletions(-) > > diff --git a/block/iscsi.c b/block/iscsi.c > index f8e496f..123fa06 100644 > --- a/block/iscsi.c > +++ b/block/iscsi.c > @@ -830,6 +830,15 @@ retry: > qemu_coroutine_yield(); > } > > + if (iTask.status == SCSI_STATUS_CHECK_CONDITION && > + iTask.task->sense.key == SCSI_SENSE_ILLEGAL_REQUEST && > + iTask.task->sense.ascq == SCSI_SENSE_ASCQ_INVALID_OPERATION_CODE) { > + /* WRITE SAME is not supported by the target */ > + iscsilun->has_write_same = false; > + scsi_free_scsi_task(iTask.task); > + return -ENOTSUP; > + } > + > if (iTask.task != NULL) { > scsi_free_scsi_task(iTask.task); > iTask.task = NULL; > @@ -840,14 +849,6 @@ retry: > } > > if (iTask.status != SCSI_STATUS_GOOD) { > - if (iTask.status == SCSI_STATUS_CHECK_CONDITION && > - iTask.task->sense.key == SCSI_SENSE_ILLEGAL_REQUEST && > - iTask.task->sense.ascq == SCSI_SENSE_ASCQ_INVALID_OPERATION_CODE) { > - /* WRITE SAME is not supported by the target */ > - iscsilun->has_write_same = false; > - return -ENOTSUP; > - } > - > return -EIO; > } > >
diff --git a/block/iscsi.c b/block/iscsi.c index f8e496f..123fa06 100644 --- a/block/iscsi.c +++ b/block/iscsi.c @@ -830,6 +830,15 @@ retry: qemu_coroutine_yield(); } + if (iTask.status == SCSI_STATUS_CHECK_CONDITION && + iTask.task->sense.key == SCSI_SENSE_ILLEGAL_REQUEST && + iTask.task->sense.ascq == SCSI_SENSE_ASCQ_INVALID_OPERATION_CODE) { + /* WRITE SAME is not supported by the target */ + iscsilun->has_write_same = false; + scsi_free_scsi_task(iTask.task); + return -ENOTSUP; + } + if (iTask.task != NULL) { scsi_free_scsi_task(iTask.task); iTask.task = NULL; @@ -840,14 +849,6 @@ retry: } if (iTask.status != SCSI_STATUS_GOOD) { - if (iTask.status == SCSI_STATUS_CHECK_CONDITION && - iTask.task->sense.key == SCSI_SENSE_ILLEGAL_REQUEST && - iTask.task->sense.ascq == SCSI_SENSE_ASCQ_INVALID_OPERATION_CODE) { - /* WRITE SAME is not supported by the target */ - iscsilun->has_write_same = false; - return -ENOTSUP; - } - return -EIO; }
commit fa6252b0 introduced a segfault because it tries to read iTask.task->sense after iTask.task has been freed. CC: qemu-stable@nongnu.org Signed-off-by: Peter Lieven <pl@kamp.de> --- block/iscsi.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-)