2020-07-31 06:54:56

by Jing Xiangfeng

Subject: [PATCH] scsi: lpfc: Add the missed misc_deregister() for lpfc_init()

lpfc_init() misses to call misc_deregister() in an error path. Add a
label 'unregister' to fix it.

Signed-off-by: Jing Xiangfeng <[email protected]>
---
drivers/scsi/lpfc/lpfc_init.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/drivers/scsi/lpfc/lpfc_init.c b/drivers/scsi/lpfc/lpfc_init.c
index 6637f84a3d1b..ec40bc91e124 100644
--- a/drivers/scsi/lpfc/lpfc_init.c
+++ b/drivers/scsi/lpfc/lpfc_init.c
@@ -13982,17 +13982,18 @@ lpfc_init(void)
printk(KERN_ERR "Could not register lpfcmgmt device, "
"misc_register returned with status %d", error);

+ error = -ENOMEM;
lpfc_transport_functions.vport_create = lpfc_vport_create;
lpfc_transport_functions.vport_delete = lpfc_vport_delete;
lpfc_transport_template =
fc_attach_transport(&lpfc_transport_functions);
if (lpfc_transport_template == NULL)
- return -ENOMEM;
+ goto unregister;
lpfc_vport_transport_template =
fc_attach_transport(&lpfc_vport_transport_functions);
if (lpfc_vport_transport_template == NULL) {
fc_release_transport(lpfc_transport_template);
- return -ENOMEM;
+ goto unregister;
}
lpfc_nvme_cmd_template();
lpfc_nvmet_cmd_template();
@@ -14018,6 +14019,8 @@ lpfc_init(void)
cpuhp_failure:
fc_release_transport(lpfc_transport_template);
fc_release_transport(lpfc_vport_transport_template);
+unregister:
+ misc_deregister(&lpfc_mgmt_dev);

return error;
}
--
2.17.1

2020-08-04 16:24:40

by James Smart

Subject: Re: [PATCH] scsi: lpfc: Add the missed misc_deregister() for lpfc_init()

On 7/30/2020 11:56 PM, Jing Xiangfeng wrote:
> lpfc_init() misses to call misc_deregister() in an error path. Add a
> label 'unregister' to fix it.
>
> Signed-off-by: Jing Xiangfeng <[email protected]>
> ---
> drivers/scsi/lpfc/lpfc_init.c | 7 +++++--
> 1 file changed, 5 insertions(+), 2 deletions(-)
>
>
Looks fine.

Reviewed-by: James Smart <[email protected]>


Thanks

-- james

2020-08-05 01:21:11

by Martin K. Petersen

Subject: Re: [PATCH] scsi: lpfc: Add the missed misc_deregister() for lpfc_init()

On Fri, 31 Jul 2020 14:56:39 +0800, Jing Xiangfeng wrote:

> lpfc_init() misses to call misc_deregister() in an error path. Add a
> label 'unregister' to fix it.

Applied to 5.9/scsi-queue, thanks!

[1/1] scsi: lpfc: Add missing misc_deregister() for lpfc_init()
https://git.kernel.org/mkp/scsi/c/1eaff53649b8

--
Martin K. Petersen Oracle Linux Engineering