---

yaml --- r: 20017 b: refs/heads/master c: b365b3d h: refs/heads/master i: 20015: f21df95 v: v3
git-mirror · Feb 6, 2006 · 978d6f5 · 978d6f5
1 parent b4b0480
commit 978d6f5
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c171fef5c8566cf5f57877e7832fa696ecdf5228
+refs/heads/master: b365b3daf2a9e2a8b002ea9fef877af1c71513fd
diff --git a/trunk/lib/kobject.c b/trunk/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;