3 files changed, 163 insertions, 191 deletions

diff --git a/lib/Makefile b/lib/Makefile
index 4f3f3e256501..6c4ea33bb2cb 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -10,7 +10,7 @@ lib-y := ctype.o string.o vsprintf.o cmdline.o \
 lib-$(CONFIG_MMU) += ioremap.o
 lib-$(CONFIG_SMP) += cpumask.o
 
-lib-y   += kobject.o kref.o kobject_uevent.o klist.o
+lib-y   += kobject.o kref.o klist.o
 
 obj-y += div64.o sort.o parser.o halfmd4.o debug_locks.o random32.o \
          bust_spinlocks.o hexdump.o kasprintf.o
@@ -20,6 +20,7 @@ CFLAGS_kobject.o += -DDEBUG
 CFLAGS_kobject_uevent.o += -DDEBUG
 endif
 
+lib-$(CONFIG_HOTPLUG) += kobject_uevent.o
 obj-$(CONFIG_GENERIC_IOMAP) += iomap.o
 obj-$(CONFIG_HAS_IOMEM) += iomap_copy.o devres.o
 obj-$(CONFIG_CHECK_SIGNATURE) += check_signature.o
diff --git a/lib/kobject.c b/lib/kobject.c
index 4b08e0ff95c8..03d40360ff1b 100644
--- a/lib/kobject.c
+++ b/lib/kobject.c
@@ -2,6 +2,8 @@
  * kobject.c - library routines for handling generic kernel objects
  *
  * Copyright (c) 2002-2003 Patrick Mochel <mochel@osdl.org>
+ * Copyright (c) 2006-2007 Greg Kroah-Hartman <greg@kroah.com>
+ * Copyright (c) 2006-2007 Novell Inc.
  *
  * This file is released under the GPLv2.
  *
@@ -44,11 +46,11 @@ static int populate_dir(struct kobject * kobj)
         return error;
 }
 
-static int create_dir(struct kobject *kobj, struct sysfs_dirent *shadow_parent)
+static int create_dir(struct kobject * kobj)
 {
         int error = 0;
         if (kobject_name(kobj)) {
-                error = sysfs_create_dir(kobj, shadow_parent);
+                error = sysfs_create_dir(kobj);
                 if (!error) {
                         if ((error = populate_dir(kobj)))
                                 sysfs_remove_dir(kobj);
@@ -131,7 +133,6 @@ void kobject_init(struct kobject * kobj)
                 return;
         kref_init(&kobj->kref);
         INIT_LIST_HEAD(&kobj->entry);
-        init_waitqueue_head(&kobj->poll);
         kobj->kset = kset_get(kobj->kset);
 }
 
@@ -157,12 +158,11 @@ static void unlink(struct kobject * kobj)
 }
 
 /**
- *      kobject_shadow_add - add an object to the hierarchy.
+ *      kobject_add - add an object to the hierarchy.
  *      @kobj:  object.
- *      @shadow_parent: sysfs directory to add to.
  */
 
-int kobject_shadow_add(struct kobject *kobj, struct sysfs_dirent *shadow_parent)
+int kobject_add(struct kobject * kobj)
 {
         int error = 0;
         struct kobject * parent;
@@ -170,7 +170,7 @@ int kobject_shadow_add(struct kobject *kobj, struct sysfs_dirent *shadow_parent)
         if (!(kobj = kobject_get(kobj)))
                 return -ENOENT;
         if (!kobj->k_name)
-                kobj->k_name = kobj->name;
+                kobject_set_name(kobj, "NO_NAME");
         if (!*kobj->k_name) {
                 pr_debug("kobject attempted to be registered with no name!\n");
                 WARN_ON(1);
@@ -181,7 +181,7 @@ int kobject_shadow_add(struct kobject *kobj, struct sysfs_dirent *shadow_parent)
 
         pr_debug("kobject %s: registering. parent: %s, set: %s\n",
                  kobject_name(kobj), parent ? kobject_name(parent) : "<NULL>", 
-                 kobj->kset ? kobj->kset->kobj.name : "<NULL>" );
+                 kobj->kset ? kobject_name(&kobj->kset->kobj) : "<NULL>" );
 
         if (kobj->kset) {
                 spin_lock(&kobj->kset->list_lock);
@@ -194,7 +194,7 @@ int kobject_shadow_add(struct kobject *kobj, struct sysfs_dirent *shadow_parent)
                 kobj->parent = parent;
         }
 
-        error = create_dir(kobj, shadow_parent);
+        error = create_dir(kobj);
         if (error) {
                 /* unlink does the kobject_put() for us */
                 unlink(kobj);
@@ -216,16 +216,6 @@ int kobject_shadow_add(struct kobject *kobj, struct sysfs_dirent *shadow_parent)
 }
 
 /**
- *      kobject_add - add an object to the hierarchy.
- *      @kobj:  object.
- */
-int kobject_add(struct kobject * kobj)
-{
-        return kobject_shadow_add(kobj, NULL);
-}
-
-
-/**
  *      kobject_register - initialize and add an object.
  *      @kobj:  object in question.
  */
@@ -255,54 +245,50 @@ int kobject_register(struct kobject * kobj)
 int kobject_set_name(struct kobject * kobj, const char * fmt, ...)
 {
         int error = 0;
-        int limit = KOBJ_NAME_LEN;
+        int limit;
         int need;
         va_list args;
-        char * name;
+        char *name;
 
-        /* 
-         * First, try the static array 
-         */
-        va_start(args,fmt);
-        need = vsnprintf(kobj->name,limit,fmt,args);
+        /* find out how big a buffer we need */
+        name = kmalloc(1024, GFP_KERNEL);
+        if (!name) {
+                error = -ENOMEM;
+                goto done;
+        }
+        va_start(args, fmt);
+        need = vsnprintf(name, 1024, fmt, args);
         va_end(args);
-        if (need < limit) 
-                name = kobj->name;
-        else {
-                /* 
-                 * Need more space? Allocate it and try again 
-                 */
-                limit = need + 1;
-                name = kmalloc(limit,GFP_KERNEL);
-                if (!name) {
-                        error = -ENOMEM;
-                        goto Done;
-                }
-                va_start(args,fmt);
-                need = vsnprintf(name,limit,fmt,args);
-                va_end(args);
-
-                /* Still? Give up. */
-                if (need >= limit) {
-                        kfree(name);
-                        error = -EFAULT;
-                        goto Done;
-                }
+        kfree(name);
+
+        /* Allocate the new space and copy the string in */
+        limit = need + 1;
+        name = kmalloc(limit, GFP_KERNEL);
+        if (!name) {
+                error = -ENOMEM;
+                goto done;
+        }
+        va_start(args, fmt);
+        need = vsnprintf(name, limit, fmt, args);
+        va_end(args);
+
+        /* something wrong with the string we copied? */
+        if (need >= limit) {
+                kfree(name);
+                error = -EFAULT;
+                goto done;
         }
 
         /* Free the old name, if necessary. */
-        if (kobj->k_name && kobj->k_name != kobj->name)
-                kfree(kobj->k_name);
+        kfree(kobj->k_name);
 
         /* Now, set the new name */
         kobj->k_name = name;
- Done:
+done:
         return error;
 }
-
 EXPORT_SYMBOL(kobject_set_name);
 
-
 /**
  *      kobject_rename - change the name of an object
  *      @kobj:  object in question.
@@ -338,7 +324,7 @@ int kobject_rename(struct kobject * kobj, const char *new_name)
         /* Note : if we want to send the new name alone, not the full path,
          * we could probably use kobject_name(kobj); */
 
-        error = sysfs_rename_dir(kobj, kobj->parent->sd, new_name);
+        error = sysfs_rename_dir(kobj, new_name);
 
         /* This function is mostly/only used for network interface.
          * Some hotplug package track interfaces by their name and
@@ -355,27 +341,6 @@ out:
 }
 
 /**
- *      kobject_rename - change the name of an object
- *      @kobj:  object in question.
- *      @new_parent: object's new parent
- *      @new_name: object's new name
- */
-
-int kobject_shadow_rename(struct kobject *kobj,
-                          struct sysfs_dirent *new_parent, const char *new_name)
-{
-        int error = 0;
-
-        kobj = kobject_get(kobj);
-        if (!kobj)
-                return -EINVAL;
-        error = sysfs_rename_dir(kobj, new_parent, new_name);
-        kobject_put(kobj);
-
-        return error;
-}
-
-/**
  *      kobject_move - move object to another parent
  *      @kobj:  object in question.
  *      @new_parent: object's new parent (can be NULL)
@@ -477,13 +442,16 @@ void kobject_cleanup(struct kobject * kobj)
         struct kobj_type * t = get_ktype(kobj);
         struct kset * s = kobj->kset;
         struct kobject * parent = kobj->parent;
+        const char *name = kobj->k_name;
 
         pr_debug("kobject %s: cleaning up\n",kobject_name(kobj));
-        if (kobj->k_name != kobj->name)
-                kfree(kobj->k_name);
-        kobj->k_name = NULL;
-        if (t && t->release)
+        if (t && t->release) {
                 t->release(kobj);
+                /* If we have a release function, we can guess that this was
+                 * not a statically allocated kobject, so we should be safe to
+                 * free the name */
+                kfree(name);
+        }
         if (s)
                 kset_put(s);
         kobject_put(parent);
@@ -651,11 +619,6 @@ struct kobject * kset_find_obj(struct kset * kset, const char * name)
         return ret;
 }
 
-void subsystem_init(struct kset *s)
-{
-        kset_init(s);
-}
-
 int subsystem_register(struct kset *s)
 {
         return kset_register(s);
@@ -679,9 +642,9 @@ int subsys_create_file(struct kset *s, struct subsys_attribute *a)
         if (!s || !a)
                 return -EINVAL;
 
-        if (subsys_get(s)) {
+        if (kset_get(s)) {
                 error = sysfs_create_file(&s->kobj, &a->attr);
-                subsys_put(s);
+                kset_put(s);
         }
         return error;
 }
diff --git a/lib/kobject_uevent.c b/lib/kobject_uevent.c
index e06a8dcec0f0..2e4eae5b0824 100644
--- a/lib/kobject_uevent.c
+++ b/lib/kobject_uevent.c
@@ -22,31 +22,62 @@
 #include <linux/kobject.h>
 #include <net/sock.h>
 
-#define BUFFER_SIZE     2048    /* buffer for the variables */
-#define NUM_ENVP        32      /* number of env pointers */
 
-/* the strings here must match the enum in include/linux/kobject.h */
-const char *kobject_actions[] = {
-        "add",
-        "remove",
-        "change",
-        "move",
-        "online",
-        "offline",
-};
-
-#if defined(CONFIG_HOTPLUG)
 u64 uevent_seqnum;
-char uevent_helper[UEVENT_HELPER_PATH_LEN] = "/sbin/hotplug";
+char uevent_helper[UEVENT_HELPER_PATH_LEN] = CONFIG_UEVENT_HELPER_PATH;
 static DEFINE_SPINLOCK(sequence_lock);
 #if defined(CONFIG_NET)
 static struct sock *uevent_sock;
 #endif
 
+/* the strings here must match the enum in include/linux/kobject.h */
+static const char *kobject_actions[] = {
+        [KOBJ_ADD] =            "add",
+        [KOBJ_REMOVE] =         "remove",
+        [KOBJ_CHANGE] =         "change",
+        [KOBJ_MOVE] =           "move",
+        [KOBJ_ONLINE] =         "online",
+        [KOBJ_OFFLINE] =        "offline",
+};
+
+/**
+ * kobject_action_type - translate action string to numeric type
+ *
+ * @buf: buffer containing the action string, newline is ignored
+ * @len: length of buffer
+ * @type: pointer to the location to store the action type
+ *
+ * Returns 0 if the action string was recognized.
+ */
+int kobject_action_type(const char *buf, size_t count,
+                        enum kobject_action *type)
+{
+        enum kobject_action action;
+        int ret = -EINVAL;
+
+        if (count && buf[count-1] == '\n')
+                count--;
+
+        if (!count)
+                goto out;
+
+        for (action = 0; action < ARRAY_SIZE(kobject_actions); action++) {
+                if (strncmp(kobject_actions[action], buf, count) != 0)
+                        continue;
+                if (kobject_actions[action][count] != '\0')
+                        continue;
+                *type = action;
+                ret = 0;
+                break;
+        }
+out:
+        return ret;
+}
+
 /**
  * kobject_uevent_env - send an uevent with environmental data
  *
- * @action: action that is happening (usually KOBJ_MOVE)
+ * @action: action that is happening
  * @kobj: struct kobject that the action is happening to
  * @envp_ext: pointer to environmental data
  *
@@ -54,36 +85,26 @@ static struct sock *uevent_sock;
  * corresponding error when it fails.
  */
 int kobject_uevent_env(struct kobject *kobj, enum kobject_action action,
-                        char *envp_ext[])
+                       char *envp_ext[])
 {
-        char **envp;
-        char *buffer;
-        char *scratch;
-        const char *action_string;
+        struct kobj_uevent_env *env;
+        const char *action_string = kobject_actions[action];
         const char *devpath = NULL;
         const char *subsystem;
         struct kobject *top_kobj;
         struct kset *kset;
         struct kset_uevent_ops *uevent_ops;
         u64 seq;
-        char *seq_buff;
         int i = 0;
         int retval = 0;
-        int j;
 
         pr_debug("%s\n", __FUNCTION__);
 
-        action_string = kobject_actions[action];
-        if (!action_string) {
-                pr_debug("kobject attempted to send uevent without action_string!\n");
-                return -EINVAL;
-        }
-
         /* search the kset we belong to */
         top_kobj = kobj;
-        while (!top_kobj->kset && top_kobj->parent) {
+        while (!top_kobj->kset && top_kobj->parent)
                 top_kobj = top_kobj->parent;
-        }
+
         if (!top_kobj->kset) {
                 pr_debug("kobject attempted to send uevent without kset!\n");
                 return -EINVAL;
@@ -92,7 +113,7 @@ int kobject_uevent_env(struct kobject *kobj, enum kobject_action action,
         kset = top_kobj->kset;
         uevent_ops = kset->uevent_ops;
 
-        /*  skip the event, if the filter returns zero. */
+        /* skip the event, if the filter returns zero. */
         if (uevent_ops && uevent_ops->filter)
                 if (!uevent_ops->filter(kset, kobj)) {
                         pr_debug("kobject filter function caused the event to drop!\n");
@@ -109,18 +130,11 @@ int kobject_uevent_env(struct kobject *kobj, enum kobject_action action,
                 return 0;
         }
 
-        /* environment index */
-        envp = kzalloc(NUM_ENVP * sizeof (char *), GFP_KERNEL);
-        if (!envp)
+        /* environment buffer */
+        env = kzalloc(sizeof(struct kobj_uevent_env), GFP_KERNEL);
+        if (!env)
                 return -ENOMEM;
 
-        /* environment values */
-        buffer = kmalloc(BUFFER_SIZE, GFP_KERNEL);
-        if (!buffer) {
-                retval = -ENOMEM;
-                goto exit;
-        }
-
         /* complete object path */
         devpath = kobject_get_path(kobj, GFP_KERNEL);
         if (!devpath) {
@@ -128,29 +142,29 @@ int kobject_uevent_env(struct kobject *kobj, enum kobject_action action,
                 goto exit;
         }
 
-        /* event environemnt for helper process only */
-        envp[i++] = "HOME=/";
-        envp[i++] = "PATH=/sbin:/bin:/usr/sbin:/usr/bin";
-
         /* default keys */
-        scratch = buffer;
-        envp [i++] = scratch;
-        scratch += sprintf(scratch, "ACTION=%s", action_string) + 1;
-        envp [i++] = scratch;
-        scratch += sprintf (scratch, "DEVPATH=%s", devpath) + 1;
-        envp [i++] = scratch;
-        scratch += sprintf(scratch, "SUBSYSTEM=%s", subsystem) + 1;
-        for (j = 0; envp_ext && envp_ext[j]; j++)
-                envp[i++] = envp_ext[j];
-        /* just reserve the space, overwrite it after kset call has returned */
-        envp[i++] = seq_buff = scratch;
-        scratch += strlen("SEQNUM=18446744073709551616") + 1;
+        retval = add_uevent_var(env, "ACTION=%s", action_string);
+        if (retval)
+                goto exit;
+        retval = add_uevent_var(env, "DEVPATH=%s", devpath);
+        if (retval)
+                goto exit;
+        retval = add_uevent_var(env, "SUBSYSTEM=%s", subsystem);
+        if (retval)
+                goto exit;
+
+        /* keys passed in from the caller */
+        if (envp_ext) {
+                for (i = 0; envp_ext[i]; i++) {
+                        retval = add_uevent_var(env, envp_ext[i]);
+                        if (retval)
+                                goto exit;
+                }
+        }
 
         /* let the kset specific function add its stuff */
         if (uevent_ops && uevent_ops->uevent) {
-                retval = uevent_ops->uevent(kset, kobj,
-                                  &envp[i], NUM_ENVP - i, scratch,
-                                  BUFFER_SIZE - (scratch - buffer));
+                retval = uevent_ops->uevent(kset, kobj, env);
                 if (retval) {
                         pr_debug ("%s - uevent() returned %d\n",
                                   __FUNCTION__, retval);
@@ -158,11 +172,13 @@ int kobject_uevent_env(struct kobject *kobj, enum kobject_action action,
                 }
         }
 
-        /* we will send an event, request a new sequence number */
+        /* we will send an event, so request a new sequence number */
         spin_lock(&sequence_lock);
         seq = ++uevent_seqnum;
         spin_unlock(&sequence_lock);
-        sprintf(seq_buff, "SEQNUM=%llu", (unsigned long long)seq);
+        retval = add_uevent_var(env, "SEQNUM=%llu", (unsigned long long)seq);
+        if (retval)
+                goto exit;
 
 #if defined(CONFIG_NET)
         /* send netlink message */
@@ -172,17 +188,19 @@ int kobject_uevent_env(struct kobject *kobj, enum kobject_action action,
 
                 /* allocate message with the maximum possible size */
                 len = strlen(action_string) + strlen(devpath) + 2;
-                skb = alloc_skb(len + BUFFER_SIZE, GFP_KERNEL);
+                skb = alloc_skb(len + env->buflen, GFP_KERNEL);
                 if (skb) {
+                        char *scratch;
+
                         /* add header */
                         scratch = skb_put(skb, len);
                         sprintf(scratch, "%s@%s", action_string, devpath);
 
                         /* copy keys to our continuous event payload buffer */
-                        for (i = 2; envp[i]; i++) {
-                                len = strlen(envp[i]) + 1;
+                        for (i = 0; i < env->envp_idx; i++) {
+                                len = strlen(env->envp[i]) + 1;
                                 scratch = skb_put(skb, len);
-                                strcpy(scratch, envp[i]);
+                                strcpy(scratch, env->envp[i]);
                         }
 
                         NETLINK_CB(skb).dst_group = 1;
@@ -198,13 +216,19 @@ int kobject_uevent_env(struct kobject *kobj, enum kobject_action action,
                 argv [0] = uevent_helper;
                 argv [1] = (char *)subsystem;
                 argv [2] = NULL;
-                call_usermodehelper (argv[0], argv, envp, UMH_WAIT_EXEC);
+                retval = add_uevent_var(env, "HOME=/");
+                if (retval)
+                        goto exit;
+                retval = add_uevent_var(env, "PATH=/sbin:/bin:/usr/sbin:/usr/bin");
+                if (retval)
+                        goto exit;
+
+                call_usermodehelper (argv[0], argv, env->envp, UMH_WAIT_EXEC);
         }
 
 exit:
         kfree(devpath);
-        kfree(buffer);
-        kfree(envp);
+        kfree(env);
         return retval;
 }
 
@@ -213,7 +237,7 @@ EXPORT_SYMBOL_GPL(kobject_uevent_env);
 /**
  * kobject_uevent - notify userspace by ending an uevent
  *
- * @action: action that is happening (usually KOBJ_ADD and KOBJ_REMOVE)
+ * @action: action that is happening
  * @kobj: struct kobject that the action is happening to
  *
  * Returns 0 if kobject_uevent() is completed with success or the
@@ -227,52 +251,38 @@ int kobject_uevent(struct kobject *kobj, enum kobject_action action)
 EXPORT_SYMBOL_GPL(kobject_uevent);
 
 /**
- * add_uevent_var - helper for creating event variables
- * @envp: Pointer to table of environment variables, as passed into
- * uevent() method.
- * @num_envp: Number of environment variable slots available, as
- * passed into uevent() method.
- * @cur_index: Pointer to current index into @envp.  It should be
- * initialized to 0 before the first call to add_uevent_var(),
- * and will be incremented on success.
- * @buffer: Pointer to buffer for environment variables, as passed
- * into uevent() method.
- * @buffer_size: Length of @buffer, as passed into uevent() method.
- * @cur_len: Pointer to current length of space used in @buffer.
- * Should be initialized to 0 before the first call to
- * add_uevent_var(), and will be incremented on success.
- * @format: Format for creating environment variable (of the form
- * "XXX=%x") for snprintf().
+ * add_uevent_var - add key value string to the environment buffer
+ * @env: environment buffer structure
+ * @format: printf format for the key=value pair
  *
  * Returns 0 if environment variable was added successfully or -ENOMEM
  * if no space was available.
  */
-int add_uevent_var(char **envp, int num_envp, int *cur_index,
-                   char *buffer, int buffer_size, int *cur_len,
-                   const char *format, ...)
+int add_uevent_var(struct kobj_uevent_env *env, const char *format, ...)
 {
         va_list args;
+        int len;
 
-        /*
-         * We check against num_envp - 1 to make sure there is at
-         * least one slot left after we return, since kobject_uevent()
-         * needs to set the last slot to NULL.
-         */
-        if (*cur_index >= num_envp - 1)
+        if (env->envp_idx >= ARRAY_SIZE(env->envp)) {
+                printk(KERN_ERR "add_uevent_var: too many keys\n");
+                WARN_ON(1);
                 return -ENOMEM;
-
-        envp[*cur_index] = buffer + *cur_len;
+        }
 
         va_start(args, format);
-        *cur_len += vsnprintf(envp[*cur_index],
-                              max(buffer_size - *cur_len, 0),
-                              format, args) + 1;
+        len = vsnprintf(&env->buf[env->buflen],
+                        sizeof(env->buf) - env->buflen,
+                        format, args);
         va_end(args);
 
-        if (*cur_len > buffer_size)
+        if (len >= (sizeof(env->buf) - env->buflen)) {
+                printk(KERN_ERR "add_uevent_var: buffer size too small\n");
+                WARN_ON(1);
                 return -ENOMEM;
+        }
 
-        (*cur_index)++;
+        env->envp[env->envp_idx++] = &env->buf[env->buflen];
+        env->buflen += len + 1;
         return 0;
 }
 EXPORT_SYMBOL_GPL(add_uevent_var);
@@ -293,5 +303,3 @@ static int __init kobject_uevent_init(void)
 
 postcore_initcall(kobject_uevent_init);
 #endif
-
-#endif /* CONFIG_HOTPLUG */