adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-28 11:46:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

[PATCH] kobject: don't oops on null kobject.name

Browse source 
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>
This commit is contained in:
Chuck Ebbert 2006-01-12 20:02:00 -05:00 committed by Greg Kroah-Hartman
parent c171fef5c8
commit b365b3daf2
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/kobject.c
View file

@ -72,6 +72,8 @@ static int get_kobj_path_length(struct kobject *kobj)
* Add 1 to strlen for leading '/' of each level. * Add 1 to strlen for leading '/' of each level.
*/ */
do { do {
if (kobject_name(parent) == NULL)
return 0;
length += strlen(kobject_name(parent)) + 1; length += strlen(kobject_name(parent)) + 1;
parent = parent->parent; parent = parent->parent;
} while (parent); } while (parent);
@ -107,6 +109,8 @@ char *kobject_get_path(struct kobject *kobj, gfp_t gfp_mask)
int len; int len;
len = get_kobj_path_length(kobj); len = get_kobj_path_length(kobj);
if (len == 0)
return NULL;
path = kmalloc(len, gfp_mask); path = kmalloc(len, gfp_mask);
if (!path) if (!path)
return NULL; return NULL;