Skip to content

Commit

Permalink
[PATCH] kobject: don't oops on null kobject.name
Browse files Browse the repository at this point in the history
kobject_get_path() will oops if one of the component names is
NULL.  Fix that by returning NULL instead of oopsing.

Signed-off-by: Chuck Ebbert <76306.1226@compuserve.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
Chuck Ebbert authored and gregkh committed Feb 6, 2006
1 parent c171fef commit b365b3d
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions lib/kobject.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit b365b3d

Please sign in to comment.