mirrors
/
linux-stable
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
1
0
Fork 0
Code Issues Releases Wiki Activity

driver core fixes: make_class_name() retval checks 

Make make_class_name() return NULL on error and fixup callers in the
driver core.

Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Cornelia Huck 2006-11-27 10:35:05 +01:00 committed by Greg Kroah-Hartman
parent 270a6c4cad
commit cb360bbf63
2 changed files with 25 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
drivers/base/class.c
View File

@ -364,7 +364,7 @@ char *make_class_name(const char *name, struct kobject *kobj)
class_name = kmalloc(size, GFP_KERNEL); class_name = kmalloc(size, GFP_KERNEL);
if (!class_name) if (!class_name)
return ERR_PTR(-ENOMEM); return NULL;
strcpy(class_name, name); strcpy(class_name, name);
strcat(class_name, ":"); strcat(class_name, ":");
@ -411,8 +411,11 @@ static int make_deprecated_class_device_links(struct class_device *class_dev)
return 0; return 0;
class_name = make_class_name(class_dev->class->name, &class_dev->kobj); class_name = make_class_name(class_dev->class->name, &class_dev->kobj);
error = sysfs_create_link(&class_dev->dev->kobj, &class_dev->kobj, if (class_name)
class_name); error = sysfs_create_link(&class_dev->dev->kobj,
&class_dev->kobj, class_name);
else
error = -ENOMEM;
kfree(class_name); kfree(class_name);
return error; return error;
} }
@ -425,7 +428,8 @@ static void remove_deprecated_class_device_links(struct class_device *class_dev)
return; return;
class_name = make_class_name(class_dev->class->name, &class_dev->kobj); class_name = make_class_name(class_dev->class->name, &class_dev->kobj);
sysfs_remove_link(&class_dev->dev->kobj, class_name); if (class_name)
sysfs_remove_link(&class_dev->dev->kobj, class_name);
kfree(class_name); kfree(class_name);
} }
#else #else
@ -863,9 +867,12 @@ int class_device_rename(struct class_device *class_dev, char *new_name)
if (class_dev->dev) { if (class_dev->dev) {
new_class_name = make_class_name(class_dev->class->name, new_class_name = make_class_name(class_dev->class->name,
&class_dev->kobj); &class_dev->kobj);
sysfs_create_link(&class_dev->dev->kobj, &class_dev->kobj, if (new_class_name)
new_class_name); sysfs_create_link(&class_dev->dev->kobj,
sysfs_remove_link(&class_dev->dev->kobj, old_class_name); &class_dev->kobj, new_class_name);
if (old_class_name)
sysfs_remove_link(&class_dev->dev->kobj,
old_class_name);
} }
#endif #endif
class_device_put(class_dev); class_device_put(class_dev);

17
drivers/base/core.c
View File

@ -527,9 +527,13 @@ int device_add(struct device *dev)
&dev->kobj, dev->bus_id); &dev->kobj, dev->bus_id);
#ifdef CONFIG_SYSFS_DEPRECATED #ifdef CONFIG_SYSFS_DEPRECATED
if (parent) { if (parent) {
sysfs_create_link(&dev->kobj, &dev->parent->kobj, "device"); sysfs_create_link(&dev->kobj, &dev->parent->kobj,
class_name = make_class_name(dev->class->name, &dev->kobj); "device");
sysfs_create_link(&dev->parent->kobj, &dev->kobj, class_name); class_name = make_class_name(dev->class->name,
&dev->kobj);
if (class_name)
sysfs_create_link(&dev->parent->kobj,
&dev->kobj, class_name);
} }
#endif #endif
} }
@ -672,7 +676,9 @@ void device_del(struct device * dev)
if (parent) { if (parent) {
char *class_name = make_class_name(dev->class->name, char *class_name = make_class_name(dev->class->name,
&dev->kobj); &dev->kobj);
sysfs_remove_link(&dev->parent->kobj, class_name); if (class_name)
sysfs_remove_link(&dev->parent->kobj,
class_name);
kfree(class_name); kfree(class_name);
sysfs_remove_link(&dev->kobj, "device"); sysfs_remove_link(&dev->kobj, "device");
} }
@ -975,8 +981,7 @@ static int device_move_class_links(struct device *dev,
class_name = make_class_name(dev->class->name, &dev->kobj); class_name = make_class_name(dev->class->name, &dev->kobj);
if (!class_name) { if (!class_name) {
error = PTR_ERR(class_name); error = -ENOMEM;
class_name = NULL;
goto out; goto out;
} }
if (old_parent) { if (old_parent) {