From: David S. Miller <davem@sunset.davemloft.net>
Date: Mon, 13 Feb 2006 07:49:18 +0000 (-0800)
Subject: [SPARC64]: Range check bus number in SUN4V PCI controller driver.
X-Git-Tag: v2.6.17-rc1~1184^2~136
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=059833eb817fec3a5a7f62fba9592749c4cebc73;p=linux-2.6

[SPARC64]: Range check bus number in SUN4V PCI controller driver.

It has to be somewhere in the range from pbm->pci_first_busno to
pbm->pci_last_busno, inclusive.

Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/arch/sparc64/kernel/pci_sun4v.c b/arch/sparc64/kernel/pci_sun4v.c
index 7055616e08..dc79b748fe 100644
--- a/arch/sparc64/kernel/pci_sun4v.c
+++ b/arch/sparc64/kernel/pci_sun4v.c
@@ -514,19 +514,31 @@ struct pci_iommu_ops pci_sun4v_iommu_ops = {
 
 /* SUN4V PCI configuration space accessors. */
 
+static inline int pci_sun4v_out_of_range(struct pci_pbm_info *pbm, unsigned int bus)
+{
+	if (bus < pbm->pci_first_busno ||
+	    bus > pbm->pci_last_busno)
+		return 1;
+	return 0;
+}
+
 static int pci_sun4v_read_pci_cfg(struct pci_bus *bus_dev, unsigned int devfn,
 				  int where, int size, u32 *value)
 {
 	struct pci_pbm_info *pbm = bus_dev->sysdata;
-	unsigned long devhandle = pbm->devhandle;
+	u32 devhandle = pbm->devhandle;
 	unsigned int bus = bus_dev->number;
 	unsigned int device = PCI_SLOT(devfn);
 	unsigned int func = PCI_FUNC(devfn);
 	unsigned long ret;
 
-	ret = pci_sun4v_config_get(devhandle,
-				   HV_PCI_DEVICE_BUILD(bus, device, func),
-				   where, size);
+	if (pci_sun4v_out_of_range(pbm, bus)) {
+		ret = ~0UL;
+	} else {
+		ret = pci_sun4v_config_get(devhandle,
+				HV_PCI_DEVICE_BUILD(bus, device, func),
+				where, size);
+	}
 	switch (size) {
 	case 1:
 		*value = ret & 0xff;
@@ -547,16 +559,19 @@ static int pci_sun4v_write_pci_cfg(struct pci_bus *bus_dev, unsigned int devfn,
 				   int where, int size, u32 value)
 {
 	struct pci_pbm_info *pbm = bus_dev->sysdata;
-	unsigned long devhandle = pbm->devhandle;
+	u32 devhandle = pbm->devhandle;
 	unsigned int bus = bus_dev->number;
 	unsigned int device = PCI_SLOT(devfn);
 	unsigned int func = PCI_FUNC(devfn);
 	unsigned long ret;
 
-	ret = pci_sun4v_config_put(devhandle,
-				   HV_PCI_DEVICE_BUILD(bus, device, func),
-				   where, size, value);
-
+	if (pci_sun4v_out_of_range(pbm, bus)) {
+		/* Do nothing. */
+	} else {
+		ret = pci_sun4v_config_put(devhandle,
+				HV_PCI_DEVICE_BUILD(bus, device, func),
+				where, size, value);
+	}
 	return PCIBIOS_SUCCESSFUL;
 }