summaryrefslogtreecommitdiffstats
path: root/drivers/pci/proc.c
diff options
context:
space:
mode:
authorDavid Woodhouse <dwmw@amazon.co.uk>2017-04-12 13:25:51 +0100
committerBjorn Helgaas <bhelgaas@google.com>2017-04-18 13:00:35 -0500
commit17caf56731311c9596e7d38a70c88fcb6afa6a1b (patch)
tree9af1612f811a15941647cf6a58e5bd71bc3f3d50 /drivers/pci/proc.c
parent6bccc7f426abd640f08d8c75fb22f99483f201b4 (diff)
downloadlinux-17caf56731311c9596e7d38a70c88fcb6afa6a1b.tar.gz
linux-17caf56731311c9596e7d38a70c88fcb6afa6a1b.tar.bz2
linux-17caf56731311c9596e7d38a70c88fcb6afa6a1b.zip
PCI: Fix another sanity check bug in /proc/pci mmap
Don't match MMIO maps with I/O BARs and vice versa. Signed-off-by: David Woodhouse <dwmw@amazon.co.uk> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> Cc: stable@vger.kernel.org
Diffstat (limited to 'drivers/pci/proc.c')
-rw-r--r--drivers/pci/proc.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/drivers/pci/proc.c b/drivers/pci/proc.c
index f82710a8694d..62a0c3e788d3 100644
--- a/drivers/pci/proc.c
+++ b/drivers/pci/proc.c
@@ -231,14 +231,20 @@ static int proc_bus_pci_mmap(struct file *file, struct vm_area_struct *vma)
{
struct pci_dev *dev = PDE_DATA(file_inode(file));
struct pci_filp_private *fpriv = file->private_data;
- int i, ret, write_combine;
+ int i, ret, write_combine, res_bit;
if (!capable(CAP_SYS_RAWIO))
return -EPERM;
+ if (fpriv->mmap_state == pci_mmap_io)
+ res_bit = IORESOURCE_IO;
+ else
+ res_bit = IORESOURCE_MEM;
+
/* Make sure the caller is mapping a real resource for this device */
for (i = 0; i < PCI_ROM_RESOURCE; i++) {
- if (pci_mmap_fits(dev, i, vma, PCI_MMAP_PROCFS))
+ if (dev->resource[i].flags & res_bit &&
+ pci_mmap_fits(dev, i, vma, PCI_MMAP_PROCFS))
break;
}