Skip to content

Commit f71d82a

Browse files
Alex Williamsongregkh
authored andcommitted
vfio/pci: Clear error and request eventfd ctx after releasing
[ Upstream commit 5c5866c ] The next use of the device will generate an underflow from the stale reference. Cc: Qian Cai <[email protected]> Fixes: 1518ac2 ("vfio/pci: fix memory leaks of eventfd ctx") Reported-by: Daniel Wagner <[email protected]> Reviewed-by: Cornelia Huck <[email protected]> Tested-by: Daniel Wagner <[email protected]> Signed-off-by: Alex Williamson <[email protected]> Signed-off-by: Sasha Levin <[email protected]>
1 parent 590bcc2 commit f71d82a

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

drivers/vfio/pci/vfio_pci.c

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -392,10 +392,14 @@ static void vfio_pci_release(void *device_data)
392392
if (!(--vdev->refcnt)) {
393393
vfio_spapr_pci_eeh_release(vdev->pdev);
394394
vfio_pci_disable(vdev);
395-
if (vdev->err_trigger)
395+
if (vdev->err_trigger) {
396396
eventfd_ctx_put(vdev->err_trigger);
397-
if (vdev->req_trigger)
397+
vdev->err_trigger = NULL;
398+
}
399+
if (vdev->req_trigger) {
398400
eventfd_ctx_put(vdev->req_trigger);
401+
vdev->req_trigger = NULL;
402+
}
399403
}
400404

401405
mutex_unlock(&driver_lock);

0 commit comments

Comments
 (0)