From: Chris Wright <chrisw@sous-sol.org>
To: jbarnes@virtuousgeek.org
Cc: greg@kroah.com, khali@linux-fr.org, miltonm@bga.com,
linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org,
kvm@vger.kernel.org, allen.m.kay@intel.com,
jun.nakajima@intel.com
Subject: [PATCH 1/2] PCI: allow pci driver to support only dynids
Date: Tue, 25 Nov 2008 19:36:10 -0800 [thread overview]
Message-ID: <20081126033610.GB19881@sequoia.sous-sol.org> (raw)
commit b41d6cf38e27 (PCI: Check dynids driver_data value for validity)
requires all drivers to include an id table to try and match
driver_data. Before validating driver_data check driver has an id
table.
Cc: Jean Delvare <khali@linux-fr.org>
Cc: Milton Miller <miltonm@bga.com>
Signed-off-by: Chris Wright <chrisw@sous-sol.org>
---
drivers/pci/pci-driver.c | 20 +++++++++++---------
1 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c
index b4cdd69..0a5edbe 100644
--- a/drivers/pci/pci-driver.c
+++ b/drivers/pci/pci-driver.c
@@ -48,7 +48,7 @@ store_new_id(struct device_driver *driver, const char *buf, size_t count)
subdevice=PCI_ANY_ID, class=0, class_mask=0;
unsigned long driver_data=0;
int fields=0;
- int retval;
+ int retval=0;
fields = sscanf(buf, "%x %x %x %x %x %x %lx",
&vendor, &device, &subvendor, &subdevice,
@@ -58,16 +58,18 @@ store_new_id(struct device_driver *driver, const char *buf, size_t count)
/* Only accept driver_data values that match an existing id_table
entry */
- retval = -EINVAL;
- while (ids->vendor || ids->subvendor || ids->class_mask) {
- if (driver_data == ids->driver_data) {
- retval = 0;
- break;
+ if (ids) {
+ retval = -EINVAL;
+ while (ids->vendor || ids->subvendor || ids->class_mask) {
+ if (driver_data == ids->driver_data) {
+ retval = 0;
+ break;
+ }
+ ids++;
}
- ids++;
+ if (retval) /* No match */
+ return retval;
}
- if (retval) /* No match */
- return retval;
dynid = kzalloc(sizeof(*dynid), GFP_KERNEL);
if (!dynid)
--
1.6.0.3
next reply other threads:[~2008-11-26 3:37 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-11-26 3:36 Chris Wright [this message]
2008-11-26 3:38 ` [PATCH 2/2] PCI: pci-stub module to reserve pci device Chris Wright
2008-11-26 4:19 ` Greg KH
2008-11-26 5:07 ` Chris Wright
2008-11-26 5:17 ` [PATCH 2/2 v2] " Chris Wright
2008-11-26 8:28 ` [PATCH 1/2] PCI: allow pci driver to support only dynids Jean Delvare
2008-11-26 15:19 ` Chris Wright
2008-11-26 20:34 ` Jean Delvare
2008-11-26 21:07 ` Chris Wright
2008-12-01 20:41 ` Jesse Barnes
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=20081126033610.GB19881@sequoia.sous-sol.org \
--to=chrisw@sous-sol.org \
--cc=allen.m.kay@intel.com \
--cc=greg@kroah.com \
--cc=jbarnes@virtuousgeek.org \
--cc=jun.nakajima@intel.com \
--cc=khali@linux-fr.org \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=miltonm@bga.com \
/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
all inboxes | Powered by JetHome®