xfs: remove nr_to_write writeback windup.

[safe/jmp/linux-2.6] / lib / kobject_uevent.c

diff --git a/lib/kobject_uevent.c b/lib/kobject_uevent.c
index 239c8e8..b935795 100644 (file)
--- a/lib/kobject_uevent.c
+++ b/lib/kobject_uevent.c
@@ -19,7 +19,7 @@
 #include <linux/kobject.h>
 #include <linux/module.h>
 #include <linux/slab.h>
-
+#include <linux/user_namespace.h>
 #include <linux/socket.h>
 #include <linux/skbuff.h>
 #include <linux/netlink.h>
@@ -83,6 +83,7 @@ out:
        return ret;
 }
 
+#ifdef CONFIG_NET
 static int kobj_bcast_filter(struct sock *dsk, struct sk_buff *skb, void *data)
 {
        struct kobject *kobj = data;
@@ -98,6 +99,22 @@ static int kobj_bcast_filter(struct sock *dsk, struct sk_buff *skb, void *data)
 
        return 0;
 }
+#endif
+
+static int kobj_usermode_filter(struct kobject *kobj)
+{
+       const struct kobj_ns_type_operations *ops;
+
+       ops = kobj_ns_ops(kobj);
+       if (ops) {
+               const void *init_ns, *ns;
+               ns = kobj->ktype->namespace(kobj);
+               init_ns = ops->initial_ns();
+               return ns != init_ns;
+       }
+
+       return 0;
+}
 
 /**
  * kobject_uevent_env - send an uevent with environmental data
@@ -274,7 +291,7 @@ int kobject_uevent_env(struct kobject *kobj, enum kobject_action action,
 #endif
 
        /* call uevent_helper, usually only enabled during early boot */
-       if (uevent_helper[0]) {
+       if (uevent_helper[0] && !kobj_usermode_filter(kobj)) {
                char *argv [3];
 
                argv [0] = uevent_helper;
@@ -363,6 +380,7 @@ static int uevent_net_init(struct net *net)
        if (!ue_sk->sk) {
                printk(KERN_ERR
                       "kobject_uevent: unable to create netlink socket!\n");
+               kfree(ue_sk);
                return -ENODEV;
        }
        mutex_lock(&uevent_sock_mutex);