aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@suse.de>2006-01-20 17:08:59 -0500
committerGreg Kroah-Hartman <gregkh@suse.de>2006-02-06 15:17:17 -0500
commitc171fef5c8566cf5f57877e7832fa696ecdf5228 (patch)
treec599efed9172ce2f31835d4df01936063fad3a77
parente3f749c4af69c4344d89f11e2293e3790eb4eaca (diff)
[PATCH] kobject_add() must have a valid name in order to succeed.
So we might as well check to verify this, and let the user know that something is wrong if they didn't do it correctly, instead of oopsing later on in kobject_get_name() or somewhere else. Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--lib/kobject.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/lib/kobject.c b/lib/kobject.c
index 7a0e6809490d..fe4ae36ce960 100644
--- a/lib/kobject.c
+++ b/lib/kobject.c
@@ -162,6 +162,11 @@ int kobject_add(struct kobject * kobj)
162 return -ENOENT; 162 return -ENOENT;
163 if (!kobj->k_name) 163 if (!kobj->k_name)
164 kobj->k_name = kobj->name; 164 kobj->k_name = kobj->name;
165 if (!kobj->k_name) {
166 pr_debug("kobject attempted to be registered with no name!\n");
167 WARN_ON(1);
168 return -EINVAL;
169 }
165 parent = kobject_get(kobj->parent); 170 parent = kobject_get(kobj->parent);
166 171
167 pr_debug("kobject %s: registering. parent: %s, set: %s\n", 172 pr_debug("kobject %s: registering. parent: %s, set: %s\n",