2022-08-19 08:55:59

by Yang Yingliang

Subject: [PATCH -next] scsi: lpfc: add missing destroy_workqueue() on error path in lpfc_sli4_driver_resource_setup()

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

Fixes: 3cee98db2610 ("scsi: lpfc: Fix crash on driver unload in wq free")
Signed-off-by: Yang Yingliang <[email protected]>
---
drivers/scsi/lpfc/lpfc_init.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/drivers/scsi/lpfc/lpfc_init.c b/drivers/scsi/lpfc/lpfc_init.c
index c69c5a0979ec..a7bb1620fbe1 100644
--- a/drivers/scsi/lpfc/lpfc_init.c
+++ b/drivers/scsi/lpfc/lpfc_init.c
@@ -8053,7 +8053,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_destory_workqueue;

/* IF Type 2 ports get initialized now. */
if (bf_get(lpfc_sli_intf_if_type, &phba->sli4_hba.sli_intf) >=
@@ -8481,6 +8481,9 @@ lpfc_sli4_driver_resource_setup(struct lpfc_hba *phba)
lpfc_destroy_bootstrap_mbox(phba);
out_free_mem:
lpfc_mem_free(phba);
+out_destory_workqueue:
+ destroy_workqueue(phba->wq);
+ phba->wq = NULL;
return rc;
}

--
2.25.1

2022-08-22 19:33:41

by James Smart

Subject: Re: [PATCH -next] scsi: lpfc: add missing destroy_workqueue() on error path in lpfc_sli4_driver_resource_setup()

On 8/19/2022 1:50 AM, Yang Yingliang wrote:
> Add the missing destroy_workqueue() before return from
> lpfc_sli4_driver_resource_setup() in error path.
>
> Fixes: 3cee98db2610 ("scsi: lpfc: Fix crash on driver unload in wq free")
> Signed-off-by: Yang Yingliang <[email protected]>
> ---
> drivers/scsi/lpfc/lpfc_init.c | 5 ++++-
> 1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/scsi/lpfc/lpfc_init.c b/drivers/scsi/lpfc/lpfc_init.c
> index c69c5a0979ec..a7bb1620fbe1 100644
> --- a/drivers/scsi/lpfc/lpfc_init.c
> +++ b/drivers/scsi/lpfc/lpfc_init.c
> @@ -8053,7 +8053,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_destory_workqueue;
>
> /* IF Type 2 ports get initialized now. */
> if (bf_get(lpfc_sli_intf_if_type, &phba->sli4_hba.sli_intf) >=
> @@ -8481,6 +8481,9 @@ lpfc_sli4_driver_resource_setup(struct lpfc_hba *phba)
> lpfc_destroy_bootstrap_mbox(phba);
> out_free_mem:
> lpfc_mem_free(phba);
> +out_destory_workqueue:
> + destroy_workqueue(phba->wq);
> + phba->wq = NULL;
> return rc;
> }
>

Looks fine
but label needs spelling error corrected: out_destroy_workqueue

Please resend with this fixed

-- james