Patch "vfio/pds: Always clear the save/restore FDs on reset" has been added to the 6.7-stable tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



This is a note to let you know that I've just added the patch titled

    vfio/pds: Always clear the save/restore FDs on reset

to the 6.7-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     vfio-pds-always-clear-the-save-restore-fds-on-reset.patch
and it can be found in the queue-6.7 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.



commit 28d838ed6fa249ea9ead999d09937b9c03217a00
Author: Brett Creeley <brett.creeley@xxxxxxx>
Date:   Tue Feb 27 16:32:04 2024 -0800

    vfio/pds: Always clear the save/restore FDs on reset
    
    [ Upstream commit 8512ed256334f6637fc0699ce794792c357544ec ]
    
    After reset the VFIO device state will always be put in
    VFIO_DEVICE_STATE_RUNNING, but the save/restore files will only be
    cleared if the previous state was VFIO_DEVICE_STATE_ERROR. This
    can/will cause the restore/save files to be leaked if/when the
    migration state machine transitions through the states that
    re-allocates these files. Fix this by always clearing the
    restore/save files for resets.
    
    Fixes: 7dabb1bcd177 ("vfio/pds: Add support for firmware recovery")
    Cc: stable@xxxxxxxxxxxxxxx
    Signed-off-by: Brett Creeley <brett.creeley@xxxxxxx>
    Reviewed-by: Shannon Nelson <shannon.nelson@xxxxxxx>
    Reviewed-by: Kevin Tian <kevin.tian@xxxxxxxxx>
    Link: https://lore.kernel.org/r/20240228003205.47311-2-brett.creeley@xxxxxxx
    Signed-off-by: Alex Williamson <alex.williamson@xxxxxxxxxx>
    Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>

diff --git a/drivers/vfio/pci/pds/vfio_dev.c b/drivers/vfio/pci/pds/vfio_dev.c
index 4c351c59d05a9..a286ebcc71126 100644
--- a/drivers/vfio/pci/pds/vfio_dev.c
+++ b/drivers/vfio/pci/pds/vfio_dev.c
@@ -32,9 +32,9 @@ void pds_vfio_state_mutex_unlock(struct pds_vfio_pci_device *pds_vfio)
 	mutex_lock(&pds_vfio->reset_mutex);
 	if (pds_vfio->deferred_reset) {
 		pds_vfio->deferred_reset = false;
+		pds_vfio_put_restore_file(pds_vfio);
+		pds_vfio_put_save_file(pds_vfio);
 		if (pds_vfio->state == VFIO_DEVICE_STATE_ERROR) {
-			pds_vfio_put_restore_file(pds_vfio);
-			pds_vfio_put_save_file(pds_vfio);
 			pds_vfio_dirty_disable(pds_vfio, false);
 		}
 		pds_vfio->state = pds_vfio->deferred_reset_state;




[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Index of Archives]     [Linux USB Devel]     [Linux Audio Users]     [Yosemite News]     [Linux Kernel]     [Linux SCSI]

  Powered by Linux