1 files changed, 14 insertions, 4 deletions

diff --git a/drivers/pci/proc.c b/drivers/pci/proc.c
index e1098c302c45..593bb844b8db 100644
--- a/drivers/pci/proc.c
+++ b/drivers/pci/proc.c
@@ -252,11 +252,20 @@ static int proc_bus_pci_mmap(struct file *file, struct vm_area_struct *vma)
         const struct proc_dir_entry *dp = PDE(inode);
         struct pci_dev *dev = dp->data;
         struct pci_filp_private *fpriv = file->private_data;
-        int ret;
+        int i, ret;
 
         if (!capable(CAP_SYS_RAWIO))
                 return -EPERM;
 
+        /* 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))
+                        break;
+        }
+
+        if (i >= PCI_ROM_RESOURCE)
+                return -ENODEV;
+
         ret = pci_mmap_page_range(dev, vma,
                                   fpriv->mmap_state,
                                   fpriv->write_combine);
@@ -352,15 +361,16 @@ static int show_device(struct seq_file *m, void *v)
                         dev->vendor,
                         dev->device,
                         dev->irq);
-        /* Here should be 7 and not PCI_NUM_RESOURCES as we need to preserve compatibility */
-        for (i=0; i<7; i++) {
+
+        /* only print standard and ROM resources to preserve compatibility */
+        for (i = 0; i <= PCI_ROM_RESOURCE; i++) {
                 resource_size_t start, end;
                 pci_resource_to_user(dev, i, &dev->resource[i], &start, &end);
                 seq_printf(m, "\t%16llx",
                         (unsigned long long)(start |
                         (dev->resource[i].flags & PCI_REGION_FLAG_MASK)));
         }
-        for (i=0; i<7; i++) {
+        for (i = 0; i <= PCI_ROM_RESOURCE; i++) {
                 resource_size_t start, end;
                 pci_resource_to_user(dev, i, &dev->resource[i], &start, &end);
                 seq_printf(m, "\t%16llx",