1 files changed, 10 insertions, 2 deletions

diff --git a/lib/kobject.c b/lib/kobject.c
index 0487d1f64806..b512b746d2af 100644
--- a/lib/kobject.c
+++ b/lib/kobject.c
@@ -212,12 +212,15 @@ static int kobject_add_internal(struct kobject *kobj)
  * @fmt: format string used to build the name
  * @vargs: vargs to format the string.
  */
-static int kobject_set_name_vargs(struct kobject *kobj, const char *fmt,
+int kobject_set_name_vargs(struct kobject *kobj, const char *fmt,
                                   va_list vargs)
 {
         const char *old_name = kobj->name;
         char *s;
 
+        if (kobj->name && !fmt)
+                return 0;
+
         kobj->name = kvasprintf(GFP_KERNEL, fmt, vargs);
         if (!kobj->name)
                 return -ENOMEM;
@@ -790,11 +793,16 @@ static struct kset *kset_create(const char *name,
                                 struct kobject *parent_kobj)
 {
         struct kset *kset;
+        int retval;
 
         kset = kzalloc(sizeof(*kset), GFP_KERNEL);
         if (!kset)
                 return NULL;
-        kobject_set_name(&kset->kobj, name);
+        retval = kobject_set_name(&kset->kobj, name);
+        if (retval) {
+                kfree(kset);
+                return NULL;
+        }
         kset->uevent_ops = uevent_ops;
         kset->kobj.parent = parent_kobj;