Commit 3a9910d7 authored Mar 20, 2018 by Ben Hutchings Committed by Martin K. Petersen Apr 09, 2018

scsi: qla2xxx: Avoid double completion of abort command



qla2x00_tmf_sp_done() now deletes the timer that will run
qla2x00_tmf_iocb_timeout(), but doesn't check whether the timer already
expired.  Check the return value from del_timer() to avoid calling
complete() a second time.

Fixes: 4440e46d ("[SCSI] qla2xxx: Add IOCB Abort command asynchronous ...")
Fixes: 1514839b ("scsi: qla2xxx: Fix NULL pointer crash due to active ...")
Signed-off-by: Ben Hutchings <ben.hutchings@codethink.co.uk>
Acked-by: Himanshu Madhani <himanshu.madhani@cavium.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

parent 6d634067

drivers/scsi/qla2xxx/qla_init.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -1550,7 +1550,7 @@ qla24xx_abort_sp_done(void *ptr, int res)
		srb_t *sp = ptr;
		struct srb_iocb *abt = &sp->u.iocb_cmd;

		del_timer(&sp->u.iocb_cmd.timer);
		if (del_timer(&sp->u.iocb_cmd.timer))
		complete(&abt->u.abt.comp);
		}

Admin message