aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVishnu Dasa <vdasa@vmware.com>2022-03-17 23:00:40 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2022-03-18 13:47:48 +0100
commitc8e9b30ccae605bf1dbeaf03971f9b83f70b928d (patch)
tree9feb4b08d33d4fb5b13e0d1ba9e8cd1f59ffbc00
parent5df0e734b8c39598effe0f17e5bd8ff7748a0693 (diff)
downloadiio-c8e9b30ccae605bf1dbeaf03971f9b83f70b928d.tar.gz
VMCI: Release notification_bitmap in error path
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>
-rw-r--r--drivers/misc/vmw_vmci/vmci_guest.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/misc/vmw_vmci/vmci_guest.c b/drivers/misc/vmw_vmci/vmci_guest.c
index c8181467d4c5bc..57a6157209a19f 100644
--- a/drivers/misc/vmw_vmci/vmci_guest.c
+++ b/drivers/misc/vmw_vmci/vmci_guest.c
@@ -720,7 +720,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,