]> git.itanic.dy.fi Git - linux-stable/commitdiff
scsi: lpfc: Add missing destroy_workqueue() in error path
authorYang Yingliang <yangyingliang@huawei.com>
Tue, 23 Aug 2022 04:42:37 +0000 (12:42 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 15 Sep 2022 10:04:54 +0000 (12:04 +0200)
commit da6d507f5ff328f346b3c50e19e19993027b8ffd upstream.

Add the missing destroy_workqueue() before return from
lpfc_sli4_driver_resource_setup() in the error path.

Link: https://lore.kernel.org/r/20220823044237.285643-1-yangyingliang@huawei.com
Fixes: 3cee98db2610 ("scsi: lpfc: Fix crash on driver unload in wq free")
Reviewed-by: James Smart <jsmart2021@gmail.com>
Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/scsi/lpfc/lpfc_init.c

index b5cee2a2ac66c705654a4e11c9b892641ac2da9e..8930696021fbdca222d2171dc5571d9e2a6fc745 100644 (file)
@@ -6537,7 +6537,7 @@ lpfc_sli4_driver_resource_setup(struct lpfc_hba *phba)
        /* Allocate device driver memory */
        rc = lpfc_mem_alloc(phba, SGL_ALIGN_SZ);
        if (rc)
-               return -ENOMEM;
+               goto out_destroy_workqueue;
 
        /* IF Type 2 ports get initialized now. */
        if (bf_get(lpfc_sli_intf_if_type, &phba->sli4_hba.sli_intf) >=
@@ -6911,6 +6911,9 @@ lpfc_sli4_driver_resource_setup(struct lpfc_hba *phba)
        lpfc_destroy_bootstrap_mbox(phba);
 out_free_mem:
        lpfc_mem_free(phba);
+out_destroy_workqueue:
+       destroy_workqueue(phba->wq);
+       phba->wq = NULL;
        return rc;
 }