* [Qemu-devel] [PATCH] block/iscsi: fix segfault if writesame fails
@ 2014-02-22 12:17 Peter Lieven
2014-02-22 14:59 ` Paolo Bonzini
0 siblings, 1 reply; 2+ messages in thread
From: Peter Lieven @ 2014-02-22 12:17 UTC (permalink / raw)
To: qemu-devel
Cc: kwolf, peter.maydell, stefanha, Peter Lieven, qemu-stable,
ronniesahlberg, pbonzini
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(-)
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;
}
--
1.7.9.5
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: [Qemu-devel] [PATCH] block/iscsi: fix segfault if writesame fails
2014-02-22 12:17 [Qemu-devel] [PATCH] block/iscsi: fix segfault if writesame fails Peter Lieven
@ 2014-02-22 14:59 ` Paolo Bonzini
0 siblings, 0 replies; 2+ messages in thread
From: Paolo Bonzini @ 2014-02-22 14:59 UTC (permalink / raw)
To: Peter Lieven, qemu-devel
Cc: kwolf, peter.maydell, ronniesahlberg, stefanha, qemu-stable
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;
> }
>
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2014-02-22 15:38 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-02-22 12:17 [Qemu-devel] [PATCH] block/iscsi: fix segfault if writesame fails Peter Lieven
2014-02-22 14:59 ` Paolo Bonzini
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).