vfio-pci: Handle error from pci_iomap

ArvindYadavCs · gregkh · commit dc48ebe33063 · 2017-08-06T19:19:46.000-07:00
[ Upstream commit e19f32da5ded958238eac1bbe001192acef191a2 ]

Here, pci_iomap can fail, handle this case release selected
pci regions and return -ENOMEM.

Signed-off-by: Arvind Yadav &lt;arvind.yadav.cs@gmail.com&gt;
Signed-off-by: Alex Williamson &lt;alex.williamson@redhat.com&gt;
Signed-off-by: Sasha Levin &lt;alexander.levin@verizon.com&gt;
Signed-off-by: Greg Kroah-Hartman &lt;gregkh@linuxfoundation.org&gt;
diff --git a/drivers/vfio/pci/vfio_pci.c b/drivers/vfio/pci/vfio_pci.c
@@ -902,6 +902,10 @@ static int vfio_pci_mmap(void *device_data, struct vm_area_struct *vma)
 			return ret;
 
 		vdev->barmap[index] = pci_iomap(pdev, index, 0);
+		if (!vdev->barmap[index]) {
+			pci_release_selected_regions(pdev, 1 << index);
+			return -ENOMEM;
+		}
 	}
 
 	vma->vm_private_data = vdev;

Original file line number	Diff line number	Diff line change
`@@ -902,6 +902,10 @@ static int vfio_pci_mmap(void device_data, struct vm_area_struct vma)`
`902`	`902`	`return ret;`
`903`	`903`
`904`	`904`	`vdev->barmap[index] = pci_iomap(pdev, index, 0);`
	`905`	`+ if (!vdev->barmap[index]) {`
	`906`	`+ pci_release_selected_regions(pdev, 1 << index);`
	`907`	`+ return -ENOMEM;`
	`908`	`+ }`
`905`	`909`	`}`
`906`	`910`
`907`	`911`	`vma->vm_private_data = vdev;`