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

Merge tag 'vfio-v5.12-rc8' of git://github.com/awilliam/linux-vfio 

Pull VFIO fix from Alex Williamson:
 "Verify mmap region within range (Christian A. Ehrhardt)"

* tag 'vfio-v5.12-rc8' of git://github.com/awilliam/linux-vfio:
  vfio/pci: Add missing range check in vfio_pci_mmap
parents 2558258d 90929078

drivers/vfio/pci/vfio_pci.c

+3 −1
Original line number Diff line number Diff line
@@ -1656,6 +1656,8 @@ static int vfio_pci_mmap(void *device_data, struct vm_area_struct *vma) 


	index = vma->vm_pgoff >> (VFIO_PCI_OFFSET_SHIFT - PAGE_SHIFT);



	if (index >= VFIO_PCI_NUM_REGIONS + vdev->num_regions)

		return -EINVAL;

	if (vma->vm_end < vma->vm_start)

		return -EINVAL;

	if ((vma->vm_flags & VM_SHARED) == 0)
@@ -1664,7 +1666,7 @@ static int vfio_pci_mmap(void *device_data, struct vm_area_struct *vma) 
		int regnum = index - VFIO_PCI_NUM_REGIONS;

		struct vfio_pci_region *region = vdev->region + regnum;



		if (region && region->ops && region->ops->mmap &&

		if (region->ops && region->ops->mmap &&

		    (region->flags & VFIO_REGION_INFO_FLAG_MMAP))

			return region->ops->mmap(vdev, region, vma);

		return -EINVAL;