From 978d6f58137aee7471bdda0f03ca1e2f4120f3a9 Mon Sep 17 00:00:00 2001
From: Chuck Ebbert <76306.1226@compuserve.com>
Date: Thu, 12 Jan 2006 20:02:00 -0500
Subject: [PATCH] --- yaml --- r: 20017 b: refs/heads/master c:
 b365b3daf2a9e2a8b002ea9fef877af1c71513fd h: refs/heads/master i:   20015:
 f21df959831372857b22aec0a3aba4167159080e v: v3

---
 [refs]              | 2 +-
 trunk/lib/kobject.c | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 22eda33a258c..01d80f300a37 100644
--- 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
index fe4ae36ce960..efe67fa96a71 100644
--- 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;