stable.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* Patch "vfio-pci: Handle error from pci_iomap" has been added to the 4.4-stable tree
@ 2017-08-04 22:32 gregkh
  0 siblings, 0 replies; only message in thread
From: gregkh @ 2017-08-04 22:32 UTC (permalink / raw)
  To: arvind.yadav.cs, alex.williamson, alexander.levin, gregkh
  Cc: stable, stable-commits


This is a note to let you know that I've just added the patch titled

    vfio-pci: Handle error from pci_iomap

to the 4.4-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     vfio-pci-handle-error-from-pci_iomap.patch
and it can be found in the queue-4.4 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@vger.kernel.org> know about it.


>From foo@baz Fri Aug  4 15:30:20 PDT 2017
From: Arvind Yadav <arvind.yadav.cs@gmail.com>
Date: Tue, 3 Jan 2017 17:26:46 +0530
Subject: vfio-pci: Handle error from pci_iomap

From: Arvind Yadav <arvind.yadav.cs@gmail.com>


[ Upstream commit e19f32da5ded958238eac1bbe001192acef191a2 ]

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

Signed-off-by: Arvind Yadav <arvind.yadav.cs@gmail.com>
Signed-off-by: Alex Williamson <alex.williamson@redhat.com>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
 drivers/vfio/pci/vfio_pci.c |    4 ++++
 1 file changed, 4 insertions(+)

--- 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_da
 			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;


Patches currently in stable-queue which might be from arvind.yadav.cs@gmail.com are

queue-4.4/vfio-pci-handle-error-from-pci_iomap.patch
queue-4.4/video-fbdev-cobalt_lcdfb-handle-return-null-error-from-devm_ioremap.patch

^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2017-08-04 22:32 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-08-04 22:32 Patch "vfio-pci: Handle error from pci_iomap" has been added to the 4.4-stable tree gregkh

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).