From: Cornelia Huck make_class_name() may return an error pointer. Make sure that all callers in the driver core check for it. CC: Greg K-H Signed-off-by: Cornelia Huck Signed-off-by: Andrew Morton --- drivers/base/class.c | 25 ++++++++++++++++++++++--- drivers/base/core.c | 13 ++++++++----- 2 files changed, 30 insertions(+), 8 deletions(-) diff -puN drivers/base/class.c~return-code-checking-for-make_class_name drivers/base/class.c --- a/drivers/base/class.c~return-code-checking-for-make_class_name +++ a/drivers/base/class.c @@ -602,6 +602,11 @@ int class_device_add(struct class_device if (class_dev->dev) { class_name = make_class_name(class_dev->class->name, &class_dev->kobj); + if (IS_ERR(class_name)) { + error = PTR_ERR(class_name); + class_name = NULL; + goto out6; + } error = sysfs_create_link(&class_dev->kobj, &class_dev->dev->kobj, "device"); if (error) @@ -742,7 +747,11 @@ void class_device_del(struct class_devic class_name = make_class_name(class_dev->class->name, &class_dev->kobj); sysfs_remove_link(&class_dev->kobj, "device"); - sysfs_remove_link(&class_dev->dev->kobj, class_name); + if (!IS_ERR(class_name)) + sysfs_remove_link(&class_dev->dev->kobj, class_name); + else + /* Hmm, don't know what else to do */ + class_name = NULL; } sysfs_remove_link(&class_dev->kobj, "subsystem"); class_device_remove_file(class_dev, &class_dev->uevent_attr); @@ -805,10 +814,15 @@ int class_device_rename(struct class_dev pr_debug("CLASS: renaming '%s' to '%s'\n", class_dev->class_id, new_name); - if (class_dev->dev) + if (class_dev->dev) { old_class_name = make_class_name(class_dev->class->name, &class_dev->kobj); - + if (IS_ERR(old_class_name)) { + error = PTR_ERR(old_class_name); + old_class_name = NULL; + goto out; + } + } strlcpy(class_dev->class_id, new_name, KOBJ_NAME_LEN); error = kobject_rename(&class_dev->kobj, new_name); @@ -816,6 +830,11 @@ int class_device_rename(struct class_dev if (class_dev->dev) { new_class_name = make_class_name(class_dev->class->name, &class_dev->kobj); + if (IS_ERR(new_class_name)) { + error = PTR_ERR(new_class_name); + new_class_name = NULL; + goto out; + } error = sysfs_create_link(&class_dev->dev->kobj, &class_dev->kobj, new_class_name); if (error) diff -puN drivers/base/core.c~return-code-checking-for-make_class_name drivers/base/core.c --- a/drivers/base/core.c~return-code-checking-for-make_class_name +++ a/drivers/base/core.c @@ -621,11 +621,14 @@ void device_del(struct device * dev) sysfs_remove_link(&dev->kobj, "subsystem"); sysfs_remove_link(&dev->class->subsys.kset.kobj, dev->bus_id); class_name = make_class_name(dev->class->name, &dev->kobj); - if ((parent) && (!device_is_virtual(dev))) { - sysfs_remove_link(&dev->kobj, "device"); - sysfs_remove_link(&dev->parent->kobj, class_name); - } - kfree(class_name); + if (!IS_ERR(class_name)) { + if (parent && !device_is_virtual(dev)) { + sysfs_remove_link(&dev->kobj, "device"); + sysfs_remove_link(&dev->parent->kobj, + class_name); + } + kfree(class_name); + } down(&dev->class->sem); list_del_init(&dev->node); up(&dev->class->sem); _