Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6

1 files changed, 5 insertions, 3 deletions

diff --git a/lib/kobject_uevent.c b/lib/kobject_uevent.c
index 3f914725bda8..318328ddbd1c 100644
--- a/lib/kobject_uevent.c
+++ b/lib/kobject_uevent.c
@@ -165,7 +165,7 @@ int kobject_uevent_env(struct kobject *kobj, enum kobject_action action,
         /* keys passed in from the caller */
         if (envp_ext) {
                 for (i = 0; envp_ext[i]; i++) {
-                        retval = add_uevent_var(env, envp_ext[i]);
+                        retval = add_uevent_var(env, "%s", envp_ext[i]);
                         if (retval)
                                 goto exit;
                 }
@@ -225,8 +225,10 @@ int kobject_uevent_env(struct kobject *kobj, enum kobject_action action,
                         }
 
                         NETLINK_CB(skb).dst_group = 1;
-                        netlink_broadcast(uevent_sock, skb, 0, 1, GFP_KERNEL);
-                }
+                        retval = netlink_broadcast(uevent_sock, skb, 0, 1,
+                                                   GFP_KERNEL);
+                } else
+                        retval = -ENOMEM;
         }
 #endif