2024-04-24 12:31:26

by Christophe JAILLET

Subject: [PATCH] VMCI: Fix an error handling path in vmci_guest_probe_device()

After a successful pci_iomap_range() call, pci_iounmap() should be called
in the error handling path, as already done in the remove function.

Add the missing call.

The corresponding call was added in the remove function in commit
5ee109828e73 ("VMCI: dma dg: allocate send and receive buffers for DMA
datagrams")

Fixes: e283a0e8b7ea ("VMCI: dma dg: add MMIO access to registers")
Signed-off-by: Christophe JAILLET <[email protected]>
---
drivers/misc/vmw_vmci/vmci_guest.c | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/drivers/misc/vmw_vmci/vmci_guest.c b/drivers/misc/vmw_vmci/vmci_guest.c
index c61e8953511d..476af89e751b 100644
--- a/drivers/misc/vmw_vmci/vmci_guest.c
+++ b/drivers/misc/vmw_vmci/vmci_guest.c
@@ -625,7 +625,8 @@ static int vmci_guest_probe_device(struct pci_dev *pdev,
if (!vmci_dev) {
dev_err(&pdev->dev,
"Can't allocate memory for VMCI device\n");
- return -ENOMEM;
+ error = -ENOMEM;
+ goto err_unmap_mmio_base;
}

vmci_dev->dev = &pdev->dev;
@@ -642,7 +643,8 @@ static int vmci_guest_probe_device(struct pci_dev *pdev,
if (!vmci_dev->tx_buffer) {
dev_err(&pdev->dev,
"Can't allocate memory for datagram tx buffer\n");
- return -ENOMEM;
+ error = -ENOMEM;
+ goto err_unmap_mmio_base;
}

vmci_dev->data_buffer = dma_alloc_coherent(&pdev->dev, VMCI_DMA_DG_BUFFER_SIZE,
@@ -892,6 +894,10 @@ static int vmci_guest_probe_device(struct pci_dev *pdev,
err_free_data_buffers:
vmci_free_dg_buffers(vmci_dev);

+err_unmap_mmio_base:
+ if (mmio_base != NULL)
+ pci_iounmap(pdev, mmio_base);
+
/* The rest are managed resources and will be freed by PCI core */
return error;
}
--
2.44.0

2024-05-02 22:14:15

by Vishnu Dasa

Subject: Re: [PATCH] VMCI: Fix an error handling path in vmci_guest_probe_device()

On Wed, Apr 24, 2024 at 5:27 AM Christophe JAILLET
<[email protected]> wrote:
>
> After a successful pci_iomap_range() call, pci_iounmap() should be called
> in the error handling path, as already done in the remove function.
>
> Add the missing call.
>
> The corresponding call was added in the remove function in commit
> 5ee109828e73 ("VMCI: dma dg: allocate send and receive buffers for DMA
> datagrams")
>
> Fixes: e283a0e8b7ea ("VMCI: dma dg: add MMIO access to registers")
> Signed-off-by: Christophe JAILLET <[email protected]>

Acked-by: Vishnu Dasa <[email protected]>

> ---
> drivers/misc/vmw_vmci/vmci_guest.c | 10 ++++++++--
> 1 file changed, 8 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/misc/vmw_vmci/vmci_guest.c b/drivers/misc/vmw_vmci/vmci_guest.c
> index c61e8953511d..476af89e751b 100644
> --- a/drivers/misc/vmw_vmci/vmci_guest.c
> +++ b/drivers/misc/vmw_vmci/vmci_guest.c
> @@ -625,7 +625,8 @@ static int vmci_guest_probe_device(struct pci_dev *pdev,
> if (!vmci_dev) {
> dev_err(&pdev->dev,
> "Can't allocate memory for VMCI device\n");
> - return -ENOMEM;
> + error = -ENOMEM;
> + goto err_unmap_mmio_base;
> }
>
> vmci_dev->dev = &pdev->dev;
> @@ -642,7 +643,8 @@ static int vmci_guest_probe_device(struct pci_dev *pdev,
> if (!vmci_dev->tx_buffer) {
> dev_err(&pdev->dev,
> "Can't allocate memory for datagram tx buffer\n");
> - return -ENOMEM;
> + error = -ENOMEM;
> + goto err_unmap_mmio_base;
> }
>
> vmci_dev->data_buffer = dma_alloc_coherent(&pdev->dev, VMCI_DMA_DG_BUFFER_SIZE,
> @@ -892,6 +894,10 @@ static int vmci_guest_probe_device(struct pci_dev *pdev,
> err_free_data_buffers:
> vmci_free_dg_buffers(vmci_dev);
>
> +err_unmap_mmio_base:
> + if (mmio_base != NULL)
> + pci_iounmap(pdev, mmio_base);
> +
> /* The rest are managed resources and will be freed by PCI core */
> return error;
> }
> --
> 2.44.0
>