summaryrefslogtreecommitdiffstats
path: root/drivers/pci/pci.c
diff options
context:
space:
mode:
authorBjorn Helgaas <bhelgaas@google.com>2015-03-12 12:30:15 -0500
committerBjorn Helgaas <bhelgaas@google.com>2015-03-12 18:52:34 -0500
commit646c0282df04265f77ebd5ad3beae671e59acd5b (patch)
treea9cc33cb699729115eec9f1c99f9d3662a111941 /drivers/pci/pci.c
parent1f7bf3bfb5d60c87dcaa708fd9eabbec93f15830 (diff)
downloadlinux-646c0282df04265f77ebd5ad3beae671e59acd5b.tar.bz2
PCI: Fail pci_ioremap_bar() on unassigned resources
Make pci_ioremap_bar() fail if we're trying to map a BAR that hasn't been assigned. Normally pci_enable_device() will fail if a BAR hasn't been assigned, but a driver can successfully call pci_enable_device_io() even if a memory BAR hasn't been assigned. That driver should not be able to use pci_ioremap_bar() to map that unassigned memory BAR. Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> Acked-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'drivers/pci/pci.c')
-rw-r--r--drivers/pci/pci.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index a6d191ad9743..28df200bc54c 100644
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -131,7 +131,7 @@ void __iomem *pci_ioremap_bar(struct pci_dev *pdev, int bar)
/*
* Make sure the BAR is actually a memory resource, not an IO resource
*/
- if (!(res->flags & IORESOURCE_MEM)) {
+ if (res->flags & IORESOURCE_UNSET || !(res->flags & IORESOURCE_MEM)) {
dev_warn(&pdev->dev, "can't ioremap BAR %d: %pR\n", bar, res);
return NULL;
}