lkml.org 
[lkml]   [2004]   [Oct]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
SubjectRe: [PATCH] PCI fixes for 2.6.9
Date
From
ChangeSet 1.1997.37.42, 2004/10/06 13:04:58-07:00, lcapitulino@conectiva.com.br

[PATCH] PCI: add missing checks in drivers/pci/probe.c.

I noticed drivers/pci/probe.c::pci_scan_bus_parented() has some functions which
the return value is not checked.

The patch bellow adds the check for device_register(), class_device_register(),
class_device_create_file() and sysfs_create_link().

(hope the error label names are not too ugly).


Signed-off-by: Luiz Capitulino <lcapitulino@conectiva.com.br>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>


drivers/pci/probe.c | 36 ++++++++++++++++++++++++++++--------
1 files changed, 28 insertions(+), 8 deletions(-)


diff -Nru a/drivers/pci/probe.c b/drivers/pci/probe.c
--- a/drivers/pci/probe.c 2004-10-19 15:23:54 -07:00
+++ b/drivers/pci/probe.c 2004-10-19 15:23:54 -07:00
@@ -750,6 +750,7 @@

struct pci_bus * __devinit pci_scan_bus_parented(struct device *parent, int bus, struct pci_ops *ops, void *sysdata)
{
+ int error;
struct pci_bus *b;
struct device *dev;

@@ -769,9 +770,7 @@
if (pci_find_bus(pci_domain_nr(b), bus)) {
/* If we already got to this bus through a different bridge, ignore it */
DBG("PCI: Bus %02x already known\n", bus);
- kfree(dev);
- kfree(b);
- return NULL;
+ goto err_out;
}
list_add_tail(&b->node, &pci_root_buses);

@@ -779,15 +778,23 @@
dev->parent = parent;
dev->release = pci_release_bus_bridge_dev;
sprintf(dev->bus_id, "pci%04x:%02x", pci_domain_nr(b), bus);
- device_register(dev);
+ error = device_register(dev);
+ if (error)
+ goto dev_reg_err;
b->bridge = get_device(dev);

b->class_dev.class = &pcibus_class;
sprintf(b->class_dev.class_id, "%04x:%02x", pci_domain_nr(b), bus);
- class_device_register(&b->class_dev);
- class_device_create_file(&b->class_dev, &class_device_attr_cpuaffinity);
-
- sysfs_create_link(&b->class_dev.kobj, &b->bridge->kobj, "bridge");
+ error = class_device_register(&b->class_dev);
+ if (error)
+ goto class_dev_reg_err;
+ error = class_device_create_file(&b->class_dev, &class_device_attr_cpuaffinity);
+ if (error)
+ goto class_dev_create_file_err;
+
+ error = sysfs_create_link(&b->class_dev.kobj, &b->bridge->kobj, "bridge");
+ if (error)
+ goto sys_create_link_err;

b->number = b->secondary = bus;
b->resource[0] = &ioport_resource;
@@ -798,6 +805,19 @@
pci_bus_add_devices(b);

return b;
+
+sys_create_link_err:
+ class_device_remove_file(&b->class_dev, &class_device_attr_cpuaffinity);
+class_dev_create_file_err:
+ class_device_unregister(&b->class_dev);
+class_dev_reg_err:
+ device_unregister(dev);
+dev_reg_err:
+ list_del(&b->node);
+err_out:
+ kfree(dev);
+ kfree(b);
+ return NULL;
}
EXPORT_SYMBOL(pci_scan_bus_parented);

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

\
 
 \ /
  Last update: 2005-03-22 14:07    [W:0.070 / U:0.188 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site