lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[SCSI] libiscsi: fix null ptr regression when aborting a command with data to transfer

Browse Source 
We do not want to send data if we are aborting a task. There is
a check in iscsi_xmit_ctask, but right before calling this we overwrite
the state so we always go right past the test. Sending data causes problems
because when we clean up from a successful abort the LLD assumes that
the task is not running.

Signed-off-by: Mike Christie <michaelc@cs.wisc.edu>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
This commit is contained in:
Mike Christie
2007-08-15 01:38:29 -05:00
committed by James Bottomley
parent 604cd794de
commit 96809f1b15
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/scsi/libiscsi.c
View File

@@ -737,12 +737,19 @@ check_mgmt:
*/ */
conn->ctask = list_entry(conn->xmitqueue.next, conn->ctask = list_entry(conn->xmitqueue.next,
struct iscsi_cmd_task, running); struct iscsi_cmd_task, running);
if (conn->ctask->state == ISCSI_TASK_PENDING) { switch (conn->ctask->state) {
case ISCSI_TASK_ABORTING:
break;
case ISCSI_TASK_PENDING:
iscsi_prep_scsi_cmd_pdu(conn->ctask); iscsi_prep_scsi_cmd_pdu(conn->ctask);
conn->session->tt->init_cmd_task(conn->ctask); conn->session->tt->init_cmd_task(conn->ctask);
} /* fall through */
default:
conn->ctask->state = ISCSI_TASK_RUNNING; conn->ctask->state = ISCSI_TASK_RUNNING;
break;
}
list_move_tail(conn->xmitqueue.next, &conn->run_list); list_move_tail(conn->xmitqueue.next, &conn->run_list);
rc = iscsi_xmit_ctask(conn); rc = iscsi_xmit_ctask(conn);
if (rc) if (rc)
goto again; goto again;