Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9dbdfd23 authored by Alex Williamson's avatar Alex Williamson
Browse files

vfio: Move PCI INTx eventfd setting earlier 



We need to be ready to recieve an interrupt as soon as we call
request_irq, so our eventfd context setting needs to be moved
earlier.  Without this, an interrupt from our device or one
sharing the interrupt line can pass a NULL into eventfd_signal
and oops.

Cc: stable@vger.kernel.org
Signed-off-by: default avatarAlex Williamson <alex.williamson@redhat.com>
parent 34002f54

drivers/vfio/pci/vfio_pci_intrs.c

+3 −2
Original line number Diff line number Diff line
@@ -400,19 +400,20 @@ static int vfio_intx_set_signal(struct vfio_pci_device *vdev, int fd) 
		return PTR_ERR(trigger);

	}



	vdev->ctx[0].trigger = trigger;



	if (!vdev->pci_2_3)

		irqflags = 0;



	ret = request_irq(pdev->irq, vfio_intx_handler,

			  irqflags, vdev->ctx[0].name, vdev);

	if (ret) {

		vdev->ctx[0].trigger = NULL;

		kfree(vdev->ctx[0].name);

		eventfd_ctx_put(trigger);

		return ret;

	}



	vdev->ctx[0].trigger = trigger;



	/*

	 * INTx disable will stick across the new irq setup,

	 * disable_irq won't.