]> git.proxmox.com Git - mirror_ubuntu-jammy-kernel.git/commitdiff
VMCI: Release notification_bitmap in error path
authorVishnu Dasa <vdasa@vmware.com>
Tue, 14 Jun 2022 19:06:15 +0000 (13:06 -0600)
committerStefan Bader <stefan.bader@canonical.com>
Wed, 22 Jun 2022 12:41:24 +0000 (14:41 +0200)
BugLink: https://bugs.launchpad.net/bugs/1978145
notification_bitmap may not be released when VMCI_CAPS_DMA_DATAGRAM
capability is missing from the device.  Add missing
'err_free_notification_bitmap' label and use it instead of
'err_free_data_buffers' to avoid this.

Fixes: eed2298d9360 ("VMCI: dma dg: detect DMA datagram capability")
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Reviewed-by: Bryan Tan <bryantan@vmware.com>
Reviewed-by: Rajesh Jalisatgi <rjalisatgi@vmware.com>
Signed-off-by: Vishnu Dasa <vdasa@vmware.com>
Link: https://lore.kernel.org/r/20220318060040.31621-1-vdasa@vmware.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
(cherry picked from commit c8e9b30ccae605bf1dbeaf03971f9b83f70b928d)
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
Acked-by: Khaled Elmously <khalid.elmously@canonical.com>
Acked-by: Cengiz Can <cengiz.can@canonical.com>
Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
drivers/misc/vmw_vmci/vmci_guest.c

index 6e072728c4e0cbe228921d7e85c6da9d960e19e7..3fcbf07517ae18bf3e9728a1994183b9f2bdb84e 100644 (file)
@@ -722,7 +722,7 @@ static int vmci_guest_probe_device(struct pci_dev *pdev,
                        dev_err(&pdev->dev,
                                "Missing capability: VMCI_CAPS_DMA_DATAGRAM\n");
                        error = -ENXIO;
-                       goto err_free_data_buffers;
+                       goto err_free_notification_bitmap;
                }
        }
 
@@ -886,6 +886,7 @@ err_remove_vmci_dev_g:
        vmci_dev_g = NULL;
        spin_unlock_irq(&vmci_dev_spinlock);
 
+err_free_notification_bitmap:
        if (vmci_dev->notification_bitmap) {
                vmci_write_reg(vmci_dev, VMCI_CONTROL_RESET, VMCI_CONTROL_ADDR);
                dma_free_coherent(&pdev->dev, PAGE_SIZE,