3 files changed, 13 insertions, 3 deletions

diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
index df27132a56f4..ba106db5a65b 100644
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@ -74,6 +74,9 @@ config DEBUG_FS
           debugging files into.  Enable this option to be able to read and
           write to these files.
 
+          For detailed documentation on the debugfs API, see
+          Documentation/DocBook/filesystems.
+
           If unsure, say N.
 
 config HEADERS_CHECK
diff --git a/lib/kobject.c b/lib/kobject.c
index dcade0543bd2..744401571ed7 100644
--- a/lib/kobject.c
+++ b/lib/kobject.c
@@ -216,13 +216,19 @@ static int kobject_add_internal(struct kobject *kobj)
 static int kobject_set_name_vargs(struct kobject *kobj, const char *fmt,
                                   va_list vargs)
 {
-        /* Free the old name, if necessary. */
-        kfree(kobj->name);
+        const char *old_name = kobj->name;
+        char *s;
 
         kobj->name = kvasprintf(GFP_KERNEL, fmt, vargs);
         if (!kobj->name)
                 return -ENOMEM;
 
+        /* ewww... some of these buggers have '/' in the name ... */
+        s = strchr(kobj->name, '/');
+        if (s)
+                s[0] = '!';
+
+        kfree(old_name);
         return 0;
 }
 
diff --git a/lib/kobject_uevent.c b/lib/kobject_uevent.c
index 2fa545a63160..9f8d599459d1 100644
--- a/lib/kobject_uevent.c
+++ b/lib/kobject_uevent.c
@@ -245,7 +245,8 @@ int kobject_uevent_env(struct kobject *kobj, enum kobject_action action,
                 if (retval)
                         goto exit;
 
-                call_usermodehelper(argv[0], argv, env->envp, UMH_WAIT_EXEC);
+                retval = call_usermodehelper(argv[0], argv,
+                                             env->envp, UMH_WAIT_EXEC);
         }
 
 exit: