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

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
...@@ -400,19 +400,20 @@ static int vfio_intx_set_signal(struct vfio_pci_device *vdev, int fd) ...@@ -400,19 +400,20 @@ static int vfio_intx_set_signal(struct vfio_pci_device *vdev, int fd)
return PTR_ERR(trigger); return PTR_ERR(trigger);
} }
vdev->ctx[0].trigger = trigger;
if (!vdev->pci_2_3) if (!vdev->pci_2_3)
irqflags = 0; irqflags = 0;
ret = request_irq(pdev->irq, vfio_intx_handler, ret = request_irq(pdev->irq, vfio_intx_handler,
irqflags, vdev->ctx[0].name, vdev); irqflags, vdev->ctx[0].name, vdev);
if (ret) { if (ret) {
vdev->ctx[0].trigger = NULL;
kfree(vdev->ctx[0].name); kfree(vdev->ctx[0].name);
eventfd_ctx_put(trigger); eventfd_ctx_put(trigger);
return ret; return ret;
} }
vdev->ctx[0].trigger = trigger;
/* /*
* INTx disable will stick across the new irq setup, * INTx disable will stick across the new irq setup,
* disable_irq won't. * disable_irq won't.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment