preserve container namespace

Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
Acked-by: Serge E. Hallyn <serge.hallyn@ubuntu.com>

diff --git a/src/lxc/start.c b/src/lxc/start.c
index 216b8e65c24d6544b6b3eabfe65d2006359c432d..fa905e2b3b7601ae6a3504006fa5249329224f02 100644 (file)
--- a/src/lxc/start.c
+++ b/src/lxc/start.c
@@ -372,6 +372,7 @@ out_sigfd:
 
 struct lxc_handler *lxc_init(const char *name, struct lxc_conf *conf, const char *lxcpath)
 {
+       int i;
        struct lxc_handler *handler;
 
        handler = malloc(sizeof(*handler));
@@ -385,6 +386,9 @@ struct lxc_handler *lxc_init(const char *name, struct lxc_conf *conf, const char
        handler->lxcpath = lxcpath;
        handler->pinfd = -1;
 
+       for (i = 0; i < LXC_NS_MAX; i++)
+               handler->nsfd[i] = -1;
+
        lsm_init();
 
        handler->name = strdup(name);
@@ -475,10 +479,19 @@ out_free:
 
 void lxc_fini(const char *name, struct lxc_handler *handler)
 {
+       int i;
+
        /* The STOPPING state is there for future cleanup code
         * which can take awhile
         */
        lxc_set_state(name, handler, STOPPING);
+
+       for (i = 0; i < LXC_NS_MAX; i++) {
+               if (handler->nsfd[i] != -1) {
+                       close(handler->nsfd[i]);
+                       handler->nsfd[i] = -1;
+               }
+       }
        lxc_set_state(name, handler, STOPPED);
 
        if (run_lxc_hooks(name, "post-stop", handler->conf, handler->lxcpath, NULL))
@@ -976,6 +989,11 @@ static int lxc_spawn(struct lxc_handler *handler)
                goto out_delete_net;
        }
 
+       if (preserve_ns(handler->nsfd, handler->clone_flags, handler->pid) < 0) {
+           ERROR("failed to store namespace references");
+           goto out_delete_net;
+       }
+
        if (attach_ns(saved_ns_fd))
                WARN("failed to restore saved namespaces");
 

diff --git a/src/lxc/start.h b/src/lxc/start.h
index f1a41f59a40948389d2fb262fa4475dd0b290f3c..86b19a243fb4a79a30e18d0ac386252f9012f10d 100644 (file)
--- a/src/lxc/start.h
+++ b/src/lxc/start.h
@@ -75,6 +75,7 @@ struct lxc_handler {
        void *cgroup_data;
        int ttysock[2]; // socketpair for child->parent tty fd passing
        bool backgrounded; // indicates whether should we close std{in,out,err} on start
+       int nsfd[LXC_NS_MAX];
 };