[PATCH RESEND] VMCI: Check exclusive_vectors when freeing interrupt 1

From: vdasa
Date: Fri Mar 18 2022 - 01:59:13 EST


From: Vishnu Dasa <vdasa@xxxxxxxxxx>

free_irq() may be called to free an interrupt that was not
allocated. Add missing 'if' statement to check for
exclusive_vectors when freeing interrupt 1.

Fixes: cc68f2177fcb ("VMCI: dma dg: register dummy IRQ handlers for DMA datagrams")
Reported-by: Dan Carpenter <dan.carpenter@xxxxxxxxxx>
Reviewed-by: Bryan Tan <bryantan@xxxxxxxxxx>
Reviewed-by: Rajesh Jalisatgi <rjalisatgi@xxxxxxxxxx>
Signed-off-by: Vishnu Dasa <vdasa@xxxxxxxxxx>
---
drivers/misc/vmw_vmci/vmci_guest.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/misc/vmw_vmci/vmci_guest.c b/drivers/misc/vmw_vmci/vmci_guest.c
index 6596a54daa88..57a6157209a1 100644
--- a/drivers/misc/vmw_vmci/vmci_guest.c
+++ b/drivers/misc/vmw_vmci/vmci_guest.c
@@ -862,7 +862,9 @@ static int vmci_guest_probe_device(struct pci_dev *pdev,
return 0;

err_free_bm_irq:
- free_irq(pci_irq_vector(pdev, 1), vmci_dev);
+ if (vmci_dev->exclusive_vectors)
+ free_irq(pci_irq_vector(pdev, 1), vmci_dev);
+
err_free_irq:
free_irq(pci_irq_vector(pdev, 0), vmci_dev);
tasklet_kill(&vmci_dev->datagram_tasklet);
--
2.25.1