[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <CAF+opq26i9XmN36sxSn52rmvkaagjYVh5_+jOHh0ZQOE=_erFw@mail.gmail.com>
Date: Thu, 2 May 2024 10:06:04 -0700
From: Vishnu Dasa <vishnu.dasa@...adcom.com>
To: Christophe JAILLET <christophe.jaillet@...adoo.fr>
Cc: Bryan Tan <bryan-bt.tan@...adcom.com>,
Broadcom internal kernel review list <bcm-kernel-feedback-list@...adcom.com>, Arnd Bergmann <arnd@...db.de>,
Greg Kroah-Hartman <gregkh@...uxfoundation.org>, Jorgen Hansen <jhansen@...are.com>,
linux-kernel@...r.kernel.org, kernel-janitors@...r.kernel.org
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
<christophe.jaillet@...adoo.fr> 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 <christophe.jaillet@...adoo.fr>
Acked-by: Vishnu Dasa <vishnu.dasa@...adcom.com>
> ---
> 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
>
Powered by blists - more mailing lists