Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c1635cb7 authored by Mike Christie's avatar Mike Christie Committed by James Bottomley
Browse files

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



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: default avatarMike Christie <michaelc@cs.wisc.edu>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@HansenPartnership.com>
parent 9000bcd6

drivers/scsi/libiscsi.c

+4 −1
Original line number Diff line number Diff line
@@ -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)

{

	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;



	ctask->state = ISCSI_TASK_COMPLETED;

	ctask->sc = NULL;

	/* SCSI eh reuses commands to verify us */

	sc->SCp.ptr = NULL;

	if (conn->ctask == ctask)

		conn->ctask = NULL;

	list_del_init(&ctask->running);

	__kfifo_put(session->cmdpool.queue, (void*)&ctask, sizeof(void*));

	sc->scsi_done(sc);