UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

scsi: lpfc: Fix memory leak in lpfc_create_port() 

Commit 5e633302ac ("scsi: lpfc: vmid: Add support for VMID in mailbox
command") introduced allocations for the VMID resources in
lpfc_create_port() after the call to scsi_host_alloc(). Upon failure on the
VMID allocations, the new code would branch to the 'out' label, which
returns NULL without unwinding anything, thus skipping the call to
scsi_host_put().

Fix the problem by creating a separate label 'out_free_vmid' to unwind the
VMID resources and make the 'out_put_shost' label call only
scsi_host_put(), as was done before the introduction of allocations for
VMID.

Fixes: 5e633302ac ("scsi: lpfc: vmid: Add support for VMID in mailbox command")
Signed-off-by: Rafael Mendonca <rafaelmendsr@gmail.com>
Link: https://lore.kernel.org/r/20220916035908.712799-1-rafaelmendsr@gmail.com
Reviewed-by: James Smart <jsmart2021@gmail.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
This commit is contained in:
Rafael Mendonca 2022-09-16 00:59:07 -03:00 committed by Martin K. Petersen
parent 2331ce6126
commit dc8e483f68
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/scsi/lpfc/lpfc_init.c
View File

@ -4812,7 +4812,7 @@ lpfc_create_port(struct lpfc_hba *phba, int instance, struct device *dev)
rc = lpfc_vmid_res_alloc(phba, vport); rc = lpfc_vmid_res_alloc(phba, vport);
if (rc) if (rc)
goto out; goto out_put_shost;
/* Initialize all internally managed lists. */ /* Initialize all internally managed lists. */
INIT_LIST_HEAD(&vport->fc_nodes); INIT_LIST_HEAD(&vport->fc_nodes);
@ -4830,16 +4830,17 @@ lpfc_create_port(struct lpfc_hba *phba, int instance, struct device *dev)
error = scsi_add_host_with_dma(shost, dev, &phba->pcidev->dev); error = scsi_add_host_with_dma(shost, dev, &phba->pcidev->dev);
if (error) if (error)
goto out_put_shost; goto out_free_vmid;
spin_lock_irq(&phba->port_list_lock); spin_lock_irq(&phba->port_list_lock);
list_add_tail(&vport->listentry, &phba->port_list); list_add_tail(&vport->listentry, &phba->port_list);
spin_unlock_irq(&phba->port_list_lock); spin_unlock_irq(&phba->port_list_lock);
return vport; return vport;
out_put_shost: out_free_vmid:
kfree(vport->vmid); kfree(vport->vmid);
bitmap_free(vport->vmid_priority_range); bitmap_free(vport->vmid_priority_range);
out_put_shost:
scsi_host_put(shost); scsi_host_put(shost);
out: out:
return NULL; return NULL;