Commit 62da74a7 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'vfio-v5.15-rc4' of git://github.com/awilliam/linux-vfio 

Pull VFIO fixes from Alex Williamson:

 - Fix vfio-ap leak on uninit (Jason Gunthorpe)

 - Add missing prototype arg name (Colin Ian King)

* tag 'vfio-v5.15-rc4' of git://github.com/awilliam/linux-vfio:
  vfio/ap_ops: Add missed vfio_uninit_group_dev()
  vfio/pci: add missing identifier name in argument of function prototype
parents e7bd807e 42de956c

drivers/s390/crypto/vfio_ap_ops.c

+3 −1
Original line number Diff line number Diff line
@@ -361,6 +361,7 @@ static int vfio_ap_mdev_probe(struct mdev_device *mdev) 
	mutex_lock(&matrix_dev->lock);

	list_del(&matrix_mdev->node);

	mutex_unlock(&matrix_dev->lock);

	vfio_uninit_group_dev(&matrix_mdev->vdev);

	kfree(matrix_mdev);

err_dec_available:

	atomic_inc(&matrix_dev->available_instances);
@@ -376,9 +377,10 @@ static void vfio_ap_mdev_remove(struct mdev_device *mdev) 
	mutex_lock(&matrix_dev->lock);

	vfio_ap_mdev_reset_queues(matrix_mdev);

	list_del(&matrix_mdev->node);

	mutex_unlock(&matrix_dev->lock);

	vfio_uninit_group_dev(&matrix_mdev->vdev);

	kfree(matrix_mdev);

	atomic_inc(&matrix_dev->available_instances);

	mutex_unlock(&matrix_dev->lock);

}



static ssize_t name_show(struct mdev_type *mtype,

drivers/vfio/pci/vfio_pci_core.c

+1 −1
Original line number Diff line number Diff line
@@ -565,7 +565,7 @@ static bool vfio_pci_dev_below_slot(struct pci_dev *pdev, struct pci_slot *slot) 
}



struct vfio_pci_walk_info {

	int (*fn)(struct pci_dev *, void *data);

	int (*fn)(struct pci_dev *pdev, void *data);

	void *data;

	struct pci_dev *pdev;

	bool slot;