| Message ID | 1423089495-5647-1-git-send-email-sasha.levin@oracle.com |
|---|---|
| State | Accepted |
| Headers | show |
On Wed, 2015-02-04 at 17:38 -0500, Sasha Levin wrote: > When printing the driver_override parameter when it is 4095 and 4094 bytes > long the printing code would access invalid memory because we need count+1 > bytes for printing. > > Cc: <stable@vger.kernel.org> # v3.16+ > Fixes: 782a985d ("PCI: Introduce new device binding path using pci_dev.driver_override") > Cc: Alex Williamson <alex.williamson@redhat.com> > Cc: Bjorn Helgaas <bhelgaas@google.com> > Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> > Cc: Alexander Graf <agraf@suse.de> > Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> > Signed-off-by: Sasha Levin <sasha.levin@oracle.com> > --- > drivers/pci/pci-sysfs.c | 5 +++-- > 1 files changed, 3 insertions(+), 2 deletions(-) Acked-by: Alex Williamson <alex.williamson@redhat.com> > diff --git a/drivers/pci/pci-sysfs.c b/drivers/pci/pci-sysfs.c > index aa012fb..312f23a 100644 > --- 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); > -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Wed, Feb 04, 2015 at 05:38:15PM -0500, Sasha Levin wrote: > When printing the driver_override parameter when it is 4095 and 4094 bytes > long the printing code would access invalid memory because we need count+1 > bytes for printing. > > Cc: <stable@vger.kernel.org> # v3.16+ > Fixes: 782a985d ("PCI: Introduce new device binding path using pci_dev.driver_override") > Cc: Alex Williamson <alex.williamson@redhat.com> > Cc: Bjorn Helgaas <bhelgaas@google.com> > Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> > Cc: Alexander Graf <agraf@suse.de> > Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> > Signed-off-by: Sasha Levin <sasha.levin@oracle.com> Applied with Alex's ack to for-linus for v4.0, thanks! > --- > drivers/pci/pci-sysfs.c | 5 +++-- > 1 files changed, 3 insertions(+), 2 deletions(-) > > diff --git a/drivers/pci/pci-sysfs.c b/drivers/pci/pci-sysfs.c > index aa012fb..312f23a 100644 > --- 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); > > -- > 1.7.10.4 > -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/pci/pci-sysfs.c b/drivers/pci/pci-sysfs.c index aa012fb..312f23a 100644 --- 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);
When printing the driver_override parameter when it is 4095 and 4094 bytes long the printing code would access invalid memory because we need count+1 bytes for printing. Cc: <stable@vger.kernel.org> # v3.16+ Fixes: 782a985d ("PCI: Introduce new device binding path using pci_dev.driver_override") Cc: Alex Williamson <alex.williamson@redhat.com> Cc: Bjorn Helgaas <bhelgaas@google.com> Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> Cc: Alexander Graf <agraf@suse.de> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Sasha Levin <sasha.levin@oracle.com> --- drivers/pci/pci-sysfs.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-)