Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6

2 files changed, 10 insertions, 1 deletions

diff --git a/lib/kobject.c b/lib/kobject.c
index 7a0e6809490d..efe67fa96a71 100644
--- a/lib/kobject.c
+++ b/lib/kobject.c
@@ -72,6 +72,8 @@ static int get_kobj_path_length(struct kobject *kobj)
          * Add 1 to strlen for leading '/' of each level.
          */
         do {
+                if (kobject_name(parent) == NULL)
+                        return 0;
                 length += strlen(kobject_name(parent)) + 1;
                 parent = parent->parent;
         } while (parent);
@@ -107,6 +109,8 @@ char *kobject_get_path(struct kobject *kobj, gfp_t gfp_mask)
         int len;
 
         len = get_kobj_path_length(kobj);
+        if (len == 0)
+                return NULL;
         path = kmalloc(len, gfp_mask);
         if (!path)
                 return NULL;
@@ -162,6 +166,11 @@ int kobject_add(struct kobject * kobj)
                 return -ENOENT;
         if (!kobj->k_name)
                 kobj->k_name = kobj->name;
+        if (!kobj->k_name) {
+                pr_debug("kobject attempted to be registered with no name!\n");
+                WARN_ON(1);
+                return -EINVAL;
+        }
         parent = kobject_get(kobj->parent);
 
         pr_debug("kobject %s: registering. parent: %s, set: %s\n",
diff --git a/lib/kobject_uevent.c b/lib/kobject_uevent.c
index f56e27ae9d52..1b1985c136ec 100644
--- a/lib/kobject_uevent.c
+++ b/lib/kobject_uevent.c
@@ -22,7 +22,7 @@
 #include <linux/kobject.h>
 #include <net/sock.h>
 
-#define BUFFER_SIZE     1024    /* buffer for the variables */
+#define BUFFER_SIZE     2048    /* buffer for the variables */
 #define NUM_ENVP        32      /* number of env pointers */
 
 #if defined(CONFIG_HOTPLUG) && defined(CONFIG_NET)