renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2025-01-19 11:04:00 +08:00
Code

VMCI: Release notification_bitmap in error path

Browse Source 
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: eed2298d93 ("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>
This commit is contained in:
Vishnu Dasa 2022-03-17 23:00:40 -07:00 committed by Greg Kroah-Hartman
parent 5df0e734b8
commit c8e9b30cca
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/misc/vmw_vmci/vmci_guest.c
View File

@ -720,7 +720,7 @@ static int vmci_guest_probe_device(struct pci_dev *pdev,
dev_err(&pdev->dev, dev_err(&pdev->dev,
"Missing capability: VMCI_CAPS_DMA_DATAGRAM\n"); "Missing capability: VMCI_CAPS_DMA_DATAGRAM\n");
error = -ENXIO; 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; vmci_dev_g = NULL;
spin_unlock_irq(&vmci_dev_spinlock); spin_unlock_irq(&vmci_dev_spinlock);
err_free_notification_bitmap:
if (vmci_dev->notification_bitmap) { if (vmci_dev->notification_bitmap) {
vmci_write_reg(vmci_dev, VMCI_CONTROL_RESET, VMCI_CONTROL_ADDR); vmci_write_reg(vmci_dev, VMCI_CONTROL_RESET, VMCI_CONTROL_ADDR);
dma_free_coherent(&pdev->dev, PAGE_SIZE, dma_free_coherent(&pdev->dev, PAGE_SIZE,