diff options
| author | David Woodhouse <dwmw@amazon.co.uk> | 2017-04-12 12:25:51 (GMT) |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-05-25 13:44:47 (GMT) |
| commit | 6bec009a2f690c69239ab8c002aa1f5eca8c480e (patch) | |
| tree | 95f33ede9670444a66c85bf7b40b8531dd398534 /drivers | |
| parent | fa3bbb1c7f06e4e09f3c72ef42622ba260c77dc4 (diff) | |
| download | linux-6bec009a2f690c69239ab8c002aa1f5eca8c480e.tar.xz | |
PCI: Fix another sanity check bug in /proc/pci mmap
commit 17caf56731311c9596e7d38a70c88fcb6afa6a1b upstream.
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/pci/proc.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/drivers/pci/proc.c b/drivers/pci/proc.c index 2408abe..78802ee 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; } |