Commit f574f13d authored by Michael S. Tsirkin's avatar Michael S. Tsirkin Committed by Tim Gardner

vfio: fix ioctl error handling

BugLink: http://bugs.launchpad.net/bugs/1555640

commit 8160c4e4 upstream.

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.
Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: default avatarAlex Williamson <alex.williamson@redhat.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarTim Gardner <tim.gardner@canonical.com>
parent 92d0a34d
...@@ -446,7 +446,8 @@ static long vfio_pci_ioctl(void *device_data, ...@@ -446,7 +446,8 @@ static long vfio_pci_ioctl(void *device_data,
info.num_regions = VFIO_PCI_NUM_REGIONS; info.num_regions = VFIO_PCI_NUM_REGIONS;
info.num_irqs = VFIO_PCI_NUM_IRQS; 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) { } else if (cmd == VFIO_DEVICE_GET_REGION_INFO) {
struct pci_dev *pdev = vdev->pdev; struct pci_dev *pdev = vdev->pdev;
...@@ -520,7 +521,8 @@ static long vfio_pci_ioctl(void *device_data, ...@@ -520,7 +521,8 @@ static long vfio_pci_ioctl(void *device_data,
return -EINVAL; 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) { } else if (cmd == VFIO_DEVICE_GET_IRQ_INFO) {
struct vfio_irq_info info; struct vfio_irq_info info;
...@@ -555,7 +557,8 @@ static long vfio_pci_ioctl(void *device_data, ...@@ -555,7 +557,8 @@ static long vfio_pci_ioctl(void *device_data,
else else
info.flags |= VFIO_IRQ_INFO_NORESIZE; 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) { } else if (cmd == VFIO_DEVICE_SET_IRQS) {
struct vfio_irq_set hdr; struct vfio_irq_set hdr;
......
...@@ -219,7 +219,8 @@ static long vfio_platform_ioctl(void *device_data, ...@@ -219,7 +219,8 @@ static long vfio_platform_ioctl(void *device_data,
info.num_regions = vdev->num_regions; info.num_regions = vdev->num_regions;
info.num_irqs = vdev->num_irqs; info.num_irqs = vdev->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) { } else if (cmd == VFIO_DEVICE_GET_REGION_INFO) {
struct vfio_region_info info; struct vfio_region_info info;
...@@ -240,7 +241,8 @@ static long vfio_platform_ioctl(void *device_data, ...@@ -240,7 +241,8 @@ static long vfio_platform_ioctl(void *device_data,
info.size = vdev->regions[info.index].size; info.size = vdev->regions[info.index].size;
info.flags = vdev->regions[info.index].flags; info.flags = vdev->regions[info.index].flags;
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) { } else if (cmd == VFIO_DEVICE_GET_IRQ_INFO) {
struct vfio_irq_info info; struct vfio_irq_info info;
...@@ -259,7 +261,8 @@ static long vfio_platform_ioctl(void *device_data, ...@@ -259,7 +261,8 @@ static long vfio_platform_ioctl(void *device_data,
info.flags = vdev->irqs[info.index].flags; info.flags = vdev->irqs[info.index].flags;
info.count = vdev->irqs[info.index].count; info.count = vdev->irqs[info.index].count;
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) { } else if (cmd == VFIO_DEVICE_SET_IRQS) {
struct vfio_irq_set hdr; struct vfio_irq_set hdr;
......
...@@ -999,7 +999,8 @@ static long vfio_iommu_type1_ioctl(void *iommu_data, ...@@ -999,7 +999,8 @@ static long vfio_iommu_type1_ioctl(void *iommu_data,
info.iova_pgsizes = vfio_pgsize_bitmap(iommu); 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) { } else if (cmd == VFIO_IOMMU_MAP_DMA) {
struct vfio_iommu_type1_dma_map map; struct vfio_iommu_type1_dma_map map;
...@@ -1032,7 +1033,8 @@ static long vfio_iommu_type1_ioctl(void *iommu_data, ...@@ -1032,7 +1033,8 @@ static long vfio_iommu_type1_ioctl(void *iommu_data,
if (ret) if (ret)
return 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; return -ENOTTY;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment