Merge tag 'pci-v4.0-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci

torvalds · torvalds · commit 91e9134eda82 · 2015-03-12T09:45:46.000-07:00
Pull PCI fixes from Bjorn Helgaas:
 "Here are a couple updates for v4.0.

  One fixes a config accessor problem on APM X-Gene that we introduced
  when switching to generic config accessors, and the other fixes an
  older read-past-end-of-buffer problem in sysfs.

  APM X-Gene host bridge driver
    - Add register offset to config space base address (Feng Kan)

  Miscellaneous
    - Don't read past the end of sysfs "driver_override" buffer (Sasha Levin)"

* tag 'pci-v4.0-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci:
  PCI: xgene: Add register offset to config space base address
  PCI: Don't read past the end of sysfs "driver_override" buffer
diff --git a/drivers/pci/host/pci-xgene.c b/drivers/pci/host/pci-xgene.c
@@ -127,7 +127,7 @@ static bool xgene_pcie_hide_rc_bars(struct pci_bus *bus, int offset)
 	return false;
 }
 
-static int xgene_pcie_map_bus(struct pci_bus *bus, unsigned int devfn,
+static void __iomem *xgene_pcie_map_bus(struct pci_bus *bus, unsigned int devfn,
 			      int offset)
 {
 	struct xgene_pcie_port *port = bus->sysdata;
@@ -137,7 +137,7 @@ static int xgene_pcie_map_bus(struct pci_bus *bus, unsigned int devfn,
 		return NULL;
 
 	xgene_pcie_set_rtdid_reg(bus, devfn);
-	return xgene_pcie_get_cfg_base(bus);
+	return xgene_pcie_get_cfg_base(bus) + offset;
 }
 
 static struct pci_ops xgene_pcie_ops = {
diff --git a/drivers/pci/pci-sysfs.c b/drivers/pci/pci-sysfs.c
@@ -521,7 +521,8 @@ static ssize_t driver_override_store(struct device *dev,
 	struct pci_dev *pdev = to_pci_dev(dev);
 	char *driver_override, *old = pdev->driver_override, *cp;
 
-	if (count > PATH_MAX)
+	/* We need to keep extra room for a newline */
+	if (count >= (PAGE_SIZE - 1))
 		return -EINVAL;
 
 	driver_override = kstrndup(buf, count, GFP_KERNEL);
@@ -549,7 +550,7 @@ static ssize_t driver_override_show(struct device *dev,
 {
 	struct pci_dev *pdev = to_pci_dev(dev);
 
-	return sprintf(buf, "%s\n", pdev->driver_override);
+	return snprintf(buf, PAGE_SIZE, "%s\n", pdev->driver_override);
 }
 static DEVICE_ATTR_RW(driver_override);
 

Original file line number	Diff line number	Diff line change
`@@ -127,7 +127,7 @@ static bool xgene_pcie_hide_rc_bars(struct pci_bus *bus, int offset)`
`127`	`127`	`return false;`
`128`	`128`	`}`
`129`	`129`
`130`		`-static int xgene_pcie_map_bus(struct pci_bus *bus, unsigned int devfn,`
	`130`	`+static void __iomem xgene_pcie_map_bus(struct pci_bus bus, unsigned int devfn,`
`131`	`131`	`int offset)`
`132`	`132`	`{`
`133`	`133`	`struct xgene_pcie_port *port = bus->sysdata;`
`@@ -137,7 +137,7 @@ static int xgene_pcie_map_bus(struct pci_bus *bus, unsigned int devfn,`
`137`	`137`	`return NULL;`
`138`	`138`
`139`	`139`	`xgene_pcie_set_rtdid_reg(bus, devfn);`
`140`		`- return xgene_pcie_get_cfg_base(bus);`
	`140`	`+ return xgene_pcie_get_cfg_base(bus) + offset;`
`141`	`141`	`}`
`142`	`142`
`143`	`143`	`static struct pci_ops xgene_pcie_ops = {`
Original file line number	Diff line number	Diff line change
`@@ -521,7 +521,8 @@ static ssize_t driver_override_store(struct device *dev,`
`521`	`521`	`struct pci_dev *pdev = to_pci_dev(dev);`
`522`	`522`	`char driver_override, old = pdev->driver_override, *cp;`
`523`	`523`
`524`		`- if (count > PATH_MAX)`
	`524`	`+ /* We need to keep extra room for a newline */`
	`525`	`+ if (count >= (PAGE_SIZE - 1))`
`525`	`526`	`return -EINVAL;`
`526`	`527`
`527`	`528`	`driver_override = kstrndup(buf, count, GFP_KERNEL);`
`@@ -549,7 +550,7 @@ static ssize_t driver_override_show(struct device *dev,`
`549`	`550`	`{`
`550`	`551`	`struct pci_dev *pdev = to_pci_dev(dev);`
`551`	`552`
`552`		`- return sprintf(buf, "%s\n", pdev->driver_override);`
	`553`	`+ return snprintf(buf, PAGE_SIZE, "%s\n", pdev->driver_override);`
`553`	`554`	`}`
`554`	`555`	`static DEVICE_ATTR_RW(driver_override);`
`555`	`556`