driver core fixes: make_class_name() retval checks
PATCH 1/7 driver core fixes: make_class_name() retval checks
From: Cornelia Huck <[email protected]>
Make make_class_name() return NULL on error and fixup callers in the driver core.
Signed-off-by Cornelia Huck <[email protected]>
---
drivers/base/class.c | 23 +++++++++++++++-------- drivers/base/core.c | 14 ++++++++++---- 2 files changed, 25 insertions(+), 12 deletions(-)
drivers/base/class.c +15 -8
@@ -362,7 +362,7 @@ char *make_class_name(const char *name, class_name =kmalloc (size,GFP_KERNEL );if (!class_name) -return ERR_PTR (-ENOMEM ); +return NULL ;strcpy (class_name, name);strcat (class_name,":" );
@@ -409,8 +409,11 @@ static int make_deprecated_class_device_return 0 ; class_name =make_class_name (class_dev->class->name, &class_dev->kobj); - error =sysfs_create_link (&class_dev->dev->kobj, &class_dev->kobj, - class_name); +if (class_name) + error =sysfs_create_link (&class_dev->dev->kobj, + &class_dev->kobj, class_name); +else + error = -ENOMEM ;kfree (class_name);return error; }
@@ -420,10 +423,11 @@ static void remove_deprecated_class_devichar *class_name;if (!class_dev->dev) -return 0 ; +return ; 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); }#else
@@ -861,9 +865,12 @@ int class_device_rename(struct class_devif (class_dev->dev) { new_class_name =make_class_name (class_dev->class->name, &class_dev->kobj); -sysfs_create_link (&class_dev->dev->kobj, &class_dev->kobj, - new_class_name); -sysfs_remove_link (&class_dev->dev->kobj, old_class_name); +if (new_class_name) +sysfs_create_link (&class_dev->dev->kobj, + &class_dev->kobj, new_class_name); +if (old_class_name) +sysfs_remove_link (&class_dev->dev->kobj, + old_class_name); }#endif class_device_put (class_dev);
drivers/base/core.c +10 -4
@@ -513,9 +513,13 @@ int device_add(struct device *dev) dev->bus_id);#ifdef CONFIG_SYSFS_DEPRECATED if (parent) { -sysfs_create_link (&dev->kobj, &dev->parent->kobj,"device" ); - class_name =make_class_name (dev->class->name, &dev->kobj); -sysfs_create_link (&dev->parent->kobj, &dev->kobj, class_name); +sysfs_create_link (&dev->kobj, &dev->parent->kobj, +"device" ); + class_name =make_class_name (dev->class->name, + &dev->kobj); +if (class_name) +sysfs_create_link (&dev->parent->kobj, + &dev->kobj, class_name); }#endif }
@@ -654,7 +658,9 @@ void device_del(struct device * dev)char *class_name =NULL ; class_name =make_class_name (dev->class->name, &dev->kobj); -sysfs_remove_link (&dev->parent->kobj, class_name); +if (class_name) +sysfs_remove_link (&dev->parent->kobj, + class_name);kfree (class_name);sysfs_remove_link (&dev->kobj,"device" ); }