Skip to contentSkip to conversation

block/iscsi: fix segfault if writesame fails

PATCH In review Peter Lieven 2 participants 2 messages Feb 22, 2014 Block layer

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 block/iscsi: fix segfault if writesame fails

commit fa6252b0 introduced a segfault because it tries to read iTask.task->sense after iTask.task has been freed.

---
 block/iscsi.c |   17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)
block/iscsi.c +9 -8
index f8e496f..123fa06 100644
@@ -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;
     }
 
Signature · 1 line
1.7.9.5
#1 lore raw

Il 22/02/2014 13:17, Peter Lieven ha scritto:

Quoted 5 lines

commit fa6252b0 introduced a segfault because it tries to read iTask.task->sense after iTask.task has been freed.

Not needed, it's not in the 1.7.1 pending release. Applied to scsi-next, thanks.

Paolo

Quoted 41 lines
---
 block/iscsi.c |   17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)
block/iscsi.c +9 -8
index f8e496f..123fa06 100644
@@ -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;
     }