diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-07 16:29:55 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-07 16:29:55 -0800 |
| commit | 92118c739df879497b8cc5a2eb3a9dc255f01b20 (patch) | |
| tree | da556ca2f8afa1b43ca0626c9426f6634c64d32d /lib | |
| parent | b4669d66fb1488fd9cebe0b8da447cfeb86109ba (diff) | |
| parent | 276e0c75f1e9a8b34b7b19e8fe188be958d420dd (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/kobject.c | 9 | ||||
| -rw-r--r-- | lib/kobject_uevent.c | 2 |
2 files changed, 10 insertions, 1 deletions
diff --git a/lib/kobject.c b/lib/kobject.c index 7a0e6809490..efe67fa96a7 100644 --- a/lib/kobject.c +++ b/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; @@ -162,6 +166,11 @@ int kobject_add(struct kobject * kobj) return -ENOENT; if (!kobj->k_name) kobj->k_name = kobj->name; + if (!kobj->k_name) { + pr_debug("kobject attempted to be registered with no name!\n"); + WARN_ON(1); + return -EINVAL; + } parent = kobject_get(kobj->parent); pr_debug("kobject %s: registering. parent: %s, set: %s\n", diff --git a/lib/kobject_uevent.c b/lib/kobject_uevent.c index f56e27ae9d5..1b1985c136e 100644 --- a/lib/kobject_uevent.c +++ b/lib/kobject_uevent.c @@ -22,7 +22,7 @@ #include <linux/kobject.h> #include <net/sock.h> -#define BUFFER_SIZE 1024 /* buffer for the variables */ +#define BUFFER_SIZE 2048 /* buffer for the variables */ #define NUM_ENVP 32 /* number of env pointers */ #if defined(CONFIG_HOTPLUG) && defined(CONFIG_NET) |