summaryrefslogtreecommitdiffstats
path: root/lib/kobject.c
diff options
context:
space:
mode:
authorDave Young <hidave.darkstar@gmail.com>2009-05-11 08:17:45 +0200
committerGreg Kroah-Hartman <gregkh@suse.de>2009-06-16 06:30:24 +0200
commitd9cd8f37855b012757818f31390e8f84db251c89 (patch)
tree4785d05f5df93747b6aa3386c98784d441d61377 /lib/kobject.c
parentDriver core: fix comment for device_attach() (diff)
downloadlinux-d9cd8f37855b012757818f31390e8f84db251c89.tar.xz
linux-d9cd8f37855b012757818f31390e8f84db251c89.zip
kobject: make kset_create check kobject_set_name return value
kset_create should check the kobject_set_name return value. Add the return value checking code. Signed-off-by: Dave Young <hidave.darkstar@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'lib/kobject.c')
-rw-r--r--lib/kobject.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/lib/kobject.c b/lib/kobject.c
index bacf6fe4f7a0..b512b746d2af 100644
--- a/lib/kobject.c
+++ b/lib/kobject.c
@@ -793,11 +793,16 @@ static struct kset *kset_create(const char *name,
struct kobject *parent_kobj)
{
struct kset *kset;
+ int retval;
kset = kzalloc(sizeof(*kset), GFP_KERNEL);
if (!kset)
return NULL;
- kobject_set_name(&kset->kobj, name);
+ retval = kobject_set_name(&kset->kobj, name);
+ if (retval) {
+ kfree(kset);
+ return NULL;
+ }
kset->uevent_ops = uevent_ops;
kset->kobj.parent = parent_kobj;