Commit c8e9b30c authored by Vishnu Dasa's avatar Vishnu Dasa Committed by Greg Kroah-Hartman
Browse files

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: eed2298d ("VMCI: dma dg: detect DMA datagram capability")
Reported-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Reviewed-by: default avatarBryan Tan <bryantan@vmware.com>
Reviewed-by: default avatarRajesh Jalisatgi <rjalisatgi@vmware.com>
Signed-off-by: default avatarVishnu Dasa <vdasa@vmware.com>
Link: https://lore.kernel.org/r/20220318060040.31621-1-vdasa@vmware.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 5df0e734

drivers/misc/vmw_vmci/vmci_guest.c

+2 −1
Original line number Diff line number Diff line
@@ -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 @@ static int vmci_guest_probe_device(struct pci_dev *pdev, 
	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,