Commit 9388bd23 authored by Ben Hutchings's avatar Ben Hutchings Committed by Greg Kroah-Hartman

scsi: qla2xxx: Avoid double completion of abort command

[ Upstream commit 3a9910d7b686546dcc9986e790af17e148f1c888 ]

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: 's avatarBen Hutchings <ben.hutchings@codethink.co.uk>
Acked-by: 's avatarHimanshu Madhani <himanshu.madhani@cavium.com>
Signed-off-by: 's avatarMartin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: 's avatarSasha Levin <sashal@kernel.org>
parent d287f1da
......@@ -368,8 +368,8 @@ qla24xx_abort_sp_done(void *data, void *ptr, int res)
srb_t *sp = (srb_t *)ptr;
struct srb_iocb *abt = &sp->u.iocb_cmd;
del_timer(&sp->u.iocb_cmd.timer);
complete(&abt->u.abt.comp);
if (del_timer(&sp->u.iocb_cmd.timer))
complete(&abt->u.abt.comp);
}
static int
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment