mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-22 17:01:14 +00:00
scsi: qla2xxx: Avoid double completion of abort command
[ Upstream commit3a9910d7b6
] 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:4440e46d5d
("[SCSI] qla2xxx: Add IOCB Abort command asynchronous ...") Fixes:1514839b36
("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> Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
parent
651f11a83a
commit
a972222a6a
1 changed files with 2 additions and 2 deletions
|
@ -1365,8 +1365,8 @@ 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);
|
||||
complete(&abt->u.abt.comp);
|
||||
if (del_timer(&sp->u.iocb_cmd.timer))
|
||||
complete(&abt->u.abt.comp);
|
||||
}
|
||||
|
||||
int
|
||||
|
|
Loading…
Reference in a new issue