[PATCH] kobject: don't oops on null kobject.name

[linux-2.6-omap-h63xx.git] / lib / kobject.c

diff --git a/lib/kobject.c b/lib/kobject.c
index fe4ae36ce9604a192fe3816237c510d4ecd6075d..efe67fa96a71647b3af9f6c010fd2abc4a661619 100644 (file)
--- 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;