Commit faf44e54 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'vfio-v7.0-rc6' of https://github.com/awilliam/linux-vfio 

Pull VFIO fix from Alex Williamson:

 - Fix double-free and reference count underflow if dma-buf file
   allocation fails (Alex Williamson)

* tag 'vfio-v7.0-rc6' of https://github.com/awilliam/linux-vfio:
  vfio/pci: Fix double free in dma-buf feature
parents 56bea424 e98137f0

drivers/vfio/pci/vfio_pci_dmabuf.c

+2 −3
Original line number Diff line number Diff line
@@ -301,11 +301,10 @@ int vfio_pci_core_feature_dma_buf(struct vfio_pci_core_device *vdev, u32 flags, 
	 */

	ret = dma_buf_fd(priv->dmabuf, get_dma_buf.open_flags);

	if (ret < 0)

		goto err_dma_buf;

		dma_buf_put(priv->dmabuf);



	return ret;



err_dma_buf:

	dma_buf_put(priv->dmabuf);

err_dev_put:

	vfio_device_put_registration(&vdev->vdev);

err_free_phys: