| From: Ben Hutchings <ben.hutchings@codethink.co.uk> |
| Date: Tue, 20 Mar 2018 21:05:48 +0000 |
| Subject: scsi: qla2xxx: Avoid double completion of abort command |
| |
| commit 3a9910d7b686546dcc9986e790af17e148f1c888 upstream. |
| |
| 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: 4440e46d5db7 ("[SCSI] qla2xxx: Add IOCB Abort command asynchronous ...") |
| Fixes: 1514839b3664 ("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: Ben Hutchings <ben@decadent.org.uk> |
| --- |
| drivers/scsi/qla2xxx/qla_init.c | 4 ++-- |
| 1 file changed, 2 insertions(+), 2 deletions(-) |
| |
| --- a/drivers/scsi/qla2xxx/qla_init.c |
| +++ b/drivers/scsi/qla2xxx/qla_init.c |
| @@ -363,8 +363,8 @@ qla24xx_abort_sp_done(void *data, void * |
| 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 |
