Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bad24c7e authored by Michael S. Tsirkin's avatar Michael S. Tsirkin Committed by Sasha Levin
Browse files

vfio: fix ioctl error handling 



[ Upstream commit 8160c4e455820d5008a1116d2dca35f0363bb062 ]

Calling return copy_to_user(...) in an ioctl will not
do the right thing if there's a pagefault:
copy_to_user returns the number of bytes not copied
in this case.

Fix up vfio to do
	return copy_to_user(...)) ?
		-EFAULT : 0;

everywhere.

Cc: stable@vger.kernel.org
Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: default avatarAlex Williamson <alex.williamson@redhat.com>
Signed-off-by: default avatarSasha Levin <sasha.levin@oracle.com>
parent fa3fd247

drivers/vfio/pci/vfio_pci.c

+6 −3
Original line number Diff line number Diff line
@@ -375,7 +375,8 @@ static long vfio_pci_ioctl(void *device_data, 
		info.num_regions = VFIO_PCI_NUM_REGIONS;

		info.num_irqs = VFIO_PCI_NUM_IRQS;



		return copy_to_user((void __user *)arg, &info, minsz);

		return copy_to_user((void __user *)arg, &info, minsz) ?

			-EFAULT : 0;



	} else if (cmd == VFIO_DEVICE_GET_REGION_INFO) {

		struct pci_dev *pdev = vdev->pdev;
@@ -448,7 +449,8 @@ static long vfio_pci_ioctl(void *device_data, 
			return -EINVAL;

		}



		return copy_to_user((void __user *)arg, &info, minsz);

		return copy_to_user((void __user *)arg, &info, minsz) ?

			-EFAULT : 0;



	} else if (cmd == VFIO_DEVICE_GET_IRQ_INFO) {

		struct vfio_irq_info info;
@@ -482,7 +484,8 @@ static long vfio_pci_ioctl(void *device_data, 
		else

			info.flags |= VFIO_IRQ_INFO_NORESIZE;



		return copy_to_user((void __user *)arg, &info, minsz);

		return copy_to_user((void __user *)arg, &info, minsz) ?

			-EFAULT : 0;



	} else if (cmd == VFIO_DEVICE_SET_IRQS) {

		struct vfio_irq_set hdr;

drivers/vfio/vfio_iommu_type1.c

+4 −2
Original line number Diff line number Diff line
@@ -928,7 +928,8 @@ static long vfio_iommu_type1_ioctl(void *iommu_data, 


		info.iova_pgsizes = vfio_pgsize_bitmap(iommu);



		return copy_to_user((void __user *)arg, &info, minsz);

		return copy_to_user((void __user *)arg, &info, minsz) ?

			-EFAULT : 0;



	} else if (cmd == VFIO_IOMMU_MAP_DMA) {

		struct vfio_iommu_type1_dma_map map;
@@ -961,7 +962,8 @@ static long vfio_iommu_type1_ioctl(void *iommu_data, 
		if (ret)

			return ret;



		return copy_to_user((void __user *)arg, &unmap, minsz);

		return copy_to_user((void __user *)arg, &unmap, minsz) ?

			-EFAULT : 0;

	}



	return -ENOTTY;