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

[SCSI] libiscsi: clear conn->ctask when task is completed early

Browse Source 
If the current ctask is failed early, we legt the conn->ctask pointer
pointing to a invalid task. When the xmit thread would send data for
it, we would then oops.

Signed-off-by: Mike Christie <michaelc@cs.wisc.edu>
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
This commit is contained in:
Mike Christie
2007-12-13 12:43:33 -06:00
committed by James Bottomley
parent 9000bcd649
commit c1635cb786
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/scsi/libiscsi.c
View File

@@ -248,13 +248,16 @@ static int iscsi_prep_scsi_cmd_pdu(struct iscsi_cmd_task *ctask)
*/ */
static void iscsi_complete_command(struct iscsi_cmd_task *ctask) static void iscsi_complete_command(struct iscsi_cmd_task *ctask)
{ {
struct iscsi_session *session = ctask->conn->session; struct iscsi_conn *conn = ctask->conn;
struct iscsi_session *session = conn->session;
struct scsi_cmnd *sc = ctask->sc; struct scsi_cmnd *sc = ctask->sc;
ctask->state = ISCSI_TASK_COMPLETED; ctask->state = ISCSI_TASK_COMPLETED;
ctask->sc = NULL; ctask->sc = NULL;
/* SCSI eh reuses commands to verify us */ /* SCSI eh reuses commands to verify us */
sc->SCp.ptr = NULL; sc->SCp.ptr = NULL;
if (conn->ctask == ctask)
conn->ctask = NULL;
list_del_init(&ctask->running); list_del_init(&ctask->running);
__kfifo_put(session->cmdpool.queue, (void*)&ctask, sizeof(void*)); __kfifo_put(session->cmdpool.queue, (void*)&ctask, sizeof(void*));
sc->scsi_done(sc); sc->scsi_done(sc);