Containerized syslog working properly

[safe/jmp/linux-2.6] / kernel / nsproxy.c

diff --git a/kernel/nsproxy.c b/kernel/nsproxy.c
index 63598dc..7ade5d2 100644 (file)
--- a/kernel/nsproxy.c
+++ b/kernel/nsproxy.c
@@ -13,7 +13,9 @@
  *             Pavel Emelianov <xemul@openvz.org>
  */
 
+#include <linux/slab.h>
 #include <linux/module.h>
+#include <linux/syslog.h>
 #include <linux/nsproxy.h>
 #include <linux/init_task.h>
 #include <linux/mnt_namespace.h>
@@ -24,21 +26,27 @@
 
 static struct kmem_cache *nsproxy_cachep;
 
-struct nsproxy init_nsproxy = INIT_NSPROXY(init_nsproxy);
-
-/*
- * creates a copy of "orig" with refcount 1.
- */
-static inline struct nsproxy *clone_nsproxy(struct nsproxy *orig)
+struct nsproxy init_nsproxy = {
+       .count  = ATOMIC_INIT(1),
+       .uts_ns = &init_uts_ns,
+#if defined(CONFIG_POSIX_MQUEUE) || defined(CONFIG_SYSVIPC)
+       .ipc_ns = &init_ipc_ns,
+#endif
+       .mnt_ns = NULL,
+       .pid_ns = &init_pid_ns,
+#ifdef CONFIG_NET
+       .net_ns = &init_net,
+#endif
+};
+
+static inline struct nsproxy *create_nsproxy(void)
 {
-       struct nsproxy *ns;
+       struct nsproxy *nsproxy;
 
-       ns = kmem_cache_alloc(nsproxy_cachep, GFP_KERNEL);
-       if (ns) {
-               memcpy(ns, orig, sizeof(struct nsproxy));
-               atomic_set(&ns->count, 1);
-       }
-       return ns;
+       nsproxy = kmem_cache_alloc(nsproxy_cachep, GFP_KERNEL);
+       if (nsproxy)
+               atomic_set(&nsproxy->count, 1);
+       return nsproxy;
 }
 
 /*
@@ -52,7 +60,7 @@ static struct nsproxy *create_new_namespaces(unsigned long flags,
        struct nsproxy *new_nsp;
        int err;
 
-       new_nsp = clone_nsproxy(tsk->nsproxy);
+       new_nsp = create_nsproxy();
        if (!new_nsp)
                return ERR_PTR(-ENOMEM);
 
@@ -86,8 +94,17 @@ static struct nsproxy *create_new_namespaces(unsigned long flags,
                goto out_net;
        }
 
+       new_nsp->syslog_ns = copy_syslog_ns(flags, tsk->nsproxy->syslog_ns);
+       if (IS_ERR(new_nsp->syslog_ns)) {
+               err = PTR_ERR(new_nsp->syslog_ns);
+               goto out_syslog;
+       }
+
        return new_nsp;
 
+out_syslog:
+       if (new_nsp->net_ns)
+               put_net(new_nsp->net_ns);
 out_net:
        if (new_nsp->pid_ns)
                put_pid_ns(new_nsp->pid_ns);
@@ -156,6 +173,8 @@ out:
 
 void free_nsproxy(struct nsproxy *ns)
 {
+       if (ns->syslog_ns)
+               put_syslog_ns(ns->syslog_ns);
        if (ns->mnt_ns)
                put_mnt_ns(ns->mnt_ns);
        if (ns->uts_ns)