scsi: lpfc: Fix memory leak in lpfc_create_port()
[ Upstream commitdc8e483f68
] Commit5e633302ac
("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> Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Родитель
b9122e0e0e
Коммит
9749595feb
|
@ -4666,7 +4666,7 @@ lpfc_create_port(struct lpfc_hba *phba, int instance, struct device *dev)
|
|||
rc = lpfc_vmid_res_alloc(phba, vport);
|
||||
|
||||
if (rc)
|
||||
goto out;
|
||||
goto out_put_shost;
|
||||
|
||||
/* Initialize all internally managed lists. */
|
||||
INIT_LIST_HEAD(&vport->fc_nodes);
|
||||
|
@ -4684,16 +4684,17 @@ lpfc_create_port(struct lpfc_hba *phba, int instance, struct device *dev)
|
|||
|
||||
error = scsi_add_host_with_dma(shost, dev, &phba->pcidev->dev);
|
||||
if (error)
|
||||
goto out_put_shost;
|
||||
goto out_free_vmid;
|
||||
|
||||
spin_lock_irq(&phba->port_list_lock);
|
||||
list_add_tail(&vport->listentry, &phba->port_list);
|
||||
spin_unlock_irq(&phba->port_list_lock);
|
||||
return vport;
|
||||
|
||||
out_put_shost:
|
||||
out_free_vmid:
|
||||
kfree(vport->vmid);
|
||||
bitmap_free(vport->vmid_priority_range);
|
||||
out_put_shost:
|
||||
scsi_host_put(shost);
|
||||
out:
|
||||
return NULL;
|
||||
|
|
Загрузка…
Ссылка в новой задаче