| From c352ab2fbb2c1a71f9cd2c13dd1da5f5f36ca83a Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Tue, 25 May 2021 13:18:12 -0500 |
| Subject: scsi: qedi: Fix null ref during abort handling |
| |
| From: Mike Christie <michael.christie@oracle.com> |
| |
| [ Upstream commit 5777b7f0f03ce49372203b6521631f62f2810c8f ] |
| |
| If qedi_process_cmd_cleanup_resp finds the cmd it frees the work and sets |
| list_tmf_work to NULL, so qedi_tmf_work should check if list_tmf_work is |
| non-NULL when it wants to force cleanup. |
| |
| Link: https://lore.kernel.org/r/20210525181821.7617-20-michael.christie@oracle.com |
| Reviewed-by: Manish Rangankar <mrangankar@marvell.com> |
| Signed-off-by: Mike Christie <michael.christie@oracle.com> |
| Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/scsi/qedi/qedi_fw.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| diff --git a/drivers/scsi/qedi/qedi_fw.c b/drivers/scsi/qedi/qedi_fw.c |
| index 440ddd2309f1..cf57b4e49700 100644 |
| --- a/drivers/scsi/qedi/qedi_fw.c |
| +++ b/drivers/scsi/qedi/qedi_fw.c |
| @@ -1453,7 +1453,7 @@ abort_ret: |
| |
| ldel_exit: |
| spin_lock_bh(&qedi_conn->tmf_work_lock); |
| - if (!qedi_cmd->list_tmf_work) { |
| + if (qedi_cmd->list_tmf_work) { |
| list_del_init(&list_work->list); |
| qedi_cmd->list_tmf_work = NULL; |
| kfree(list_work); |
| -- |
| 2.30.2 |
| |