linux-pci.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Sasha Levin <sasha.levin@oracle.com>
To: linux-kernel@vger.kernel.org
Cc: gregkh@linuxfoundation.org, Sasha Levin <sasha.levin@oracle.com>,
	Bjorn Helgaas <bhelgaas@google.com>,
	linux-pci@vger.kernel.org (open list:PCI SUBSYSTEM)
Subject: [PATCH] PCI/sysfs: off by two and memory corruption in driver_override parameter
Date: Thu,  1 Jan 2015 19:27:12 -0500	[thread overview]
Message-ID: <1420158432-645-1-git-send-email-sasha.levin@oracle.com> (raw)

There are two different issues fixed here:

 - On nun-NULL terminated input a random byte of memory would get flipped
from '\n' to '\0'.
 - When printing the driver_override parameter when it is 4095 and 4094 bytes
long the printing code would access invalid memory.

Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
---
 drivers/pci/pci-sysfs.c |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/pci/pci-sysfs.c b/drivers/pci/pci-sysfs.c
index aa012fb..be6b2b1 100644
--- a/drivers/pci/pci-sysfs.c
+++ b/drivers/pci/pci-sysfs.c
@@ -521,17 +521,17 @@ 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 >= (PATH_MAX - 1))
 		return -EINVAL;
 
 	driver_override = kstrndup(buf, count, GFP_KERNEL);
 	if (!driver_override)
 		return -ENOMEM;
 
-	cp = strchr(driver_override, '\n');
-	if (cp)
-		*cp = '\0';
-
+	driver_override[count] = '\0';
+	if (driver_override[count - 1] == '\n')
+		driver_override[count - 1] = 0;
 	if (strlen(driver_override)) {
 		pdev->driver_override = driver_override;
 	} else {
-- 
1.7.10.4


             reply	other threads:[~2015-01-02  0:27 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-01-02  0:27 Sasha Levin [this message]
2015-01-03 15:09 ` [PATCH] PCI/sysfs: off by two and memory corruption in driver_override parameter Bjorn Helgaas

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1420158432-645-1-git-send-email-sasha.levin@oracle.com \
    --to=sasha.levin@oracle.com \
    --cc=bhelgaas@google.com \
    --cc=gregkh@linuxfoundation.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-pci@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).