treewide: replace local mkdir_p implementations
[project/procd.git] / jail / jail.c
index 95d6237419498696869c2658391886cff2dafdb8..c3a0ccdb7f193503df5ad53be65d662311266264 100644 (file)
@@ -1,5 +1,6 @@
 /*
  * Copyright (C) 2015 John Crispin <blogic@openwrt.org>
+ * Copyright (C) 2020 Daniel Golle <daniel@makrotopia.org>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License version 2.1
 #include <sys/mount.h>
 #include <sys/prctl.h>
 #include <sys/wait.h>
+#include <sys/types.h>
+#include <sys/time.h>
+#include <sys/resource.h>
+#include <sys/stat.h>
+#include <sys/sysmacros.h>
+
+/* musl only defined 15 limit types, make sure all 16 are supported */
+#ifndef RLIMIT_RTTIME
+#define RLIMIT_RTTIME 15
+#undef RLIMIT_NLIMITS
+#define RLIMIT_NLIMITS 16
+#undef RLIM_NLIMITS
+#define RLIM_NLIMITS 16
+#endif
 
+#include <assert.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <errno.h>
+#include <pwd.h>
+#include <grp.h>
 #include <string.h>
-#include <sys/stat.h>
 #include <fcntl.h>
-#include <libgen.h>
 #include <sched.h>
+#include <linux/filter.h>
 #include <linux/limits.h>
+#include <linux/nsfs.h>
+#include <linux/securebits.h>
+#include <signal.h>
+#include <inttypes.h>
 
 #include "capabilities.h"
 #include "elf.h"
 #include "fs.h"
 #include "jail.h"
 #include "log.h"
+#include "seccomp-oci.h"
+#include "cgroups.h"
 
+#include <libubox/blobmsg.h>
+#include <libubox/blobmsg_json.h>
+#include <libubox/list.h>
+#include <libubox/vlist.h>
 #include <libubox/uloop.h>
+#include <libubox/utils.h>
+#include <libubus.h>
+
+#ifndef CLONE_NEWCGROUP
+#define CLONE_NEWCGROUP 0x02000000
+#endif
 
 #define STACK_SIZE     (1024 * 1024)
-#define OPT_ARGS       "S:C:n:h:r:w:d:psuloc"
+#define OPT_ARGS       "S:C:n:h:r:w:d:psulocU:G:NR:fFO:T:EyJ:iP:"
+
+#define OCI_VERSION_STRING "1.0.2"
+
+struct hook_execvpe {
+       char *file;
+       char **argv;
+       char **envp;
+       int timeout;
+};
+
+struct sysctl_val {
+       char *entry;
+       char *value;
+};
+
+struct mknod_args {
+       char *path;
+       mode_t mode;
+       dev_t dev;
+       uid_t uid;
+       gid_t gid;
+};
 
 static struct {
        char *name;
        char *hostname;
        char **jail_argv;
+       char *cwd;
        char *seccomp;
+       struct sock_fprog *ociseccomp;
        char *capabilities;
+       struct jail_capset capset;
+       char *user;
+       char *group;
+       char *extroot;
+       char *overlaydir;
+       char *tmpoverlaysize;
+       char **envp;
+       char *uidmap;
+       char *gidmap;
+       char *pidfile;
+       struct sysctl_val **sysctl;
        int no_new_privs;
        int namespace;
+       struct {
+               int pid;
+               int net;
+               int ns;
+               int ipc;
+               int uts;
+               int user;
+               int cgroup;
+#ifdef CLONE_NEWTIME
+               int time;
+#endif
+       } setns;
        int procfs;
        int ronly;
        int sysfs;
+       int console;
+       int pw_uid;
+       int pw_gid;
+       int gr_gid;
+       int root_map_uid;
+       gid_t *additional_gids;
+       size_t num_additional_gids;
+       mode_t umask;
+       bool set_umask;
+       int require_jail;
+       struct {
+               struct hook_execvpe **createRuntime;
+               struct hook_execvpe **createContainer;
+               struct hook_execvpe **startContainer;
+               struct hook_execvpe **poststart;
+               struct hook_execvpe **poststop;
+       } hooks;
+       struct rlimit *rlimits[RLIM_NLIMITS];
+       int oom_score_adj;
+       bool set_oom_score_adj;
+       struct mknod_args **devices;
+       char *ocibundle;
+       bool immediately;
+       struct blob_attr *annotations;
 } opts;
 
+static struct blob_buf ocibuf;
+
 extern int pivot_root(const char *new_root, const char *put_old);
 
 int debug = 0;
 
 static char child_stack[STACK_SIZE];
 
-static int mkdir_p(char *dir, mode_t mask)
+static struct ubus_context *parent_ctx;
+
+int console_fd;
+
+
+static inline bool has_namespaces(void)
 {
-       char *l = strrchr(dir, '/');
-       int ret;
+return ((opts.setns.pid != -1) ||
+       (opts.setns.net != -1) ||
+       (opts.setns.ns != -1) ||
+       (opts.setns.ipc != -1) ||
+       (opts.setns.uts != -1) ||
+       (opts.setns.user != -1) ||
+       (opts.setns.cgroup != -1) ||
+#ifdef CLONE_NEWTIME
+       (opts.setns.time != -1) ||
+#endif
+       opts.namespace);
+}
 
-       if (!l)
-               return 0;
+static void free_oci_envp(char **p) {
+       char **tmp;
 
-       *l = '\0';
+       if (p) {
+               tmp = p;
+               while (*tmp)
+                       free(*(tmp++));
 
-       if (mkdir_p(dir, mask))
-               return -1;
+               free(p);
+       }
+}
+
+static void free_hooklist(struct hook_execvpe **hooklist)
+{
+       struct hook_execvpe *cur;
 
-       *l = '/';
+       if (!hooklist)
+               return;
 
-       ret = mkdir(dir, mask);
-       if (ret && errno == EEXIST)
-               return 0;
+       cur = *hooklist;
+       while (cur) {
+               free_oci_envp(cur->argv);
+               free_oci_envp(cur->envp);
+               free(cur->file);
+               free(cur++);
+       }
+       free(hooklist);
+}
+
+static void free_sysctl(void) {
+       struct sysctl_val *cur;
+       cur = *opts.sysctl;
+
+       while (cur) {
+               free(cur->entry);
+               free(cur->value);
+               free(cur++);
+       }
+       free(opts.sysctl);
+}
+
+static void free_devices(void) {
+       struct mknod_args **cur;
+
+       if (!opts.devices)
+               return;
 
-       if (ret)
-               ERROR("mkdir failed on %s: %s\n", dir, strerror(errno));
+       cur = opts.devices;
 
+       while (*cur) {
+               free((*cur)->path);
+               free(*(cur++));
+       }
+       free(opts.devices);
+}
+
+static void free_rlimits(void) {
+       int type;
+
+       for (type = 0; type < RLIM_NLIMITS; ++type)
+               free(opts.rlimits[type]);
+}
+
+static void free_opts(bool parent) {
+
+       free_library_search();
+       mount_free();
+       cgroups_free();
+
+       /* we need to keep argv, envp and seccomp filter in child */
+       if (parent) { /* parent-only */
+               if (opts.ociseccomp) {
+                       free(opts.ociseccomp->filter);
+                       free(opts.ociseccomp);
+               }
+
+               free_oci_envp(opts.jail_argv);
+               free_oci_envp(opts.envp);
+       }
+
+       free_rlimits();
+       free_sysctl();
+       free_devices();
+       free(opts.hostname);
+       free(opts.cwd);
+       free(opts.uidmap);
+       free(opts.gidmap);
+       free(opts.annotations);
+       free_hooklist(opts.hooks.createRuntime);
+       free_hooklist(opts.hooks.createContainer);
+       free_hooklist(opts.hooks.startContainer);
+       free_hooklist(opts.hooks.poststart);
+       free_hooklist(opts.hooks.poststop);
+}
+
+static int mount_overlay(char *jail_root, char *overlaydir) {
+       char *upperdir, *workdir, *optsstr, *upperetc, *upperresolvconf;
+       const char mountoptsformat[] = "lowerdir=%s,upperdir=%s,workdir=%s";
+       int ret = -1, fd;
+
+       if (asprintf(&upperdir, "%s%s", overlaydir, "/upper") < 0)
+               goto out;
+
+       if (asprintf(&workdir, "%s%s", overlaydir, "/work") < 0)
+               goto upper_printf;
+
+       if (asprintf(&optsstr, mountoptsformat, jail_root, upperdir, workdir) < 0)
+               goto work_printf;
+
+       if (mkdir_p(upperdir, 0755) || mkdir_p(workdir, 0755))
+               goto opts_printf;
+
+/*
+ * make sure /etc/resolv.conf exists in overlay and is owned by jail userns root
+ * this is to work-around a bug in overlayfs described in the overlayfs-userns
+ * patch:
+ * 3. modification of a file 'hithere' which is in l but not yet
+ * in u, and which is not owned by T, is not allowed, even if
+ * writes to u are allowed.  This may be a bug in overlayfs,
+ * but it is safe behavior.
+ */
+       if (asprintf(&upperetc, "%s/etc", upperdir) < 0)
+               goto opts_printf;
+
+       if (mkdir_p(upperetc, 0755))
+               goto upper_etc_printf;
+
+       if (asprintf(&upperresolvconf, "%s/resolv.conf", upperetc) < 0)
+               goto upper_etc_printf;
+
+       fd = creat(upperresolvconf, 0644);
+       if (fd == -1) {
+               if (errno != EEXIST)
+                       ERROR("creat(%s) failed: %m\n", upperresolvconf);
+       } else {
+               close(fd);
+       }
+       DEBUG("mount -t overlay %s %s (%s)\n", jail_root, jail_root, optsstr);
+
+       if (mount(jail_root, jail_root, "overlay", MS_NOATIME, optsstr))
+               goto upper_resolvconf_printf;
+
+       ret = 0;
+
+upper_resolvconf_printf:
+       free(upperresolvconf);
+upper_etc_printf:
+       free(upperetc);
+opts_printf:
+       free(optsstr);
+work_printf:
+       free(workdir);
+upper_printf:
+       free(upperdir);
+out:
        return ret;
 }
 
-int mount_bind(const char *root, const char *path, int readonly, int error)
+static void pass_console(int console_fd)
+{
+       struct ubus_context *child_ctx = ubus_connect(NULL);
+       static struct blob_buf req;
+       uint32_t id;
+
+       if (!child_ctx)
+               return;
+
+       blob_buf_init(&req, 0);
+       blobmsg_add_string(&req, "name", opts.name);
+
+       if (ubus_lookup_id(child_ctx, "container", &id) ||
+           ubus_invoke_fd(child_ctx, id, "console_set", req.head, NULL, NULL, 3000, console_fd))
+               INFO("ubus request failed\n");
+       else
+               close(console_fd);
+
+       blob_buf_free(&req);
+       ubus_free(child_ctx);
+}
+
+static int create_dev_console(const char *jail_root)
+{
+       char *console_fname;
+       char dev_console_path[PATH_MAX];
+       int slave_console_fd;
+
+       /* Open UNIX/98 virtual console */
+       console_fd = posix_openpt(O_RDWR | O_NOCTTY);
+       if (console_fd == -1)
+               return -1;
+
+       console_fname = ptsname(console_fd);
+       DEBUG("got console fd %d and PTS client name %s\n", console_fd, console_fname);
+       if (!console_fname)
+               goto no_console;
+
+       grantpt(console_fd);
+       unlockpt(console_fd);
+
+       /* pass PTY master to procd */
+       pass_console(console_fd);
+
+       /* mount-bind PTY slave to /dev/console in jail */
+       snprintf(dev_console_path, sizeof(dev_console_path), "%s/dev/console", jail_root);
+       close(creat(dev_console_path, 0620));
+
+       if (mount(console_fname, dev_console_path, "bind", MS_BIND, NULL))
+               goto no_console;
+
+       /* use PTY slave for stdio */
+       slave_console_fd = open(console_fname, O_RDWR); /* | O_NOCTTY */
+       dup2(slave_console_fd, 0);
+       dup2(slave_console_fd, 1);
+       dup2(slave_console_fd, 2);
+       close(slave_console_fd);
+
+       INFO("using guest console %s\n", console_fname);
+
+       return 0;
+
+no_console:
+       close(console_fd);
+       return 1;
+}
+
+static int hook_running = 0;
+static int hook_return_code = 0;
+static struct hook_execvpe **current_hook = NULL;
+typedef void (*hook_return_handler)(void);
+static hook_return_handler hook_return_cb = NULL;
+
+static void hook_process_timeout_cb(struct uloop_timeout *t);
+static struct uloop_timeout hook_process_timeout = {
+       .cb = hook_process_timeout_cb,
+};
+
+static void run_hooklist(void);
+static void hook_process_handler(struct uloop_process *c, int ret)
+{
+       uloop_timeout_cancel(&hook_process_timeout);
+
+       if (WIFEXITED(ret)) {
+               hook_return_code = WEXITSTATUS(ret);
+               if (hook_return_code)
+                       ERROR("hook (%d) exited with exit: %d\n", c->pid, hook_return_code);
+               else
+                       DEBUG("hook (%d) exited with exit: %d\n", c->pid, hook_return_code);
+
+       } else {
+               hook_return_code = WTERMSIG(ret);
+               ERROR("hook (%d) exited with signal: %d\n", c->pid, hook_return_code);
+       }
+       hook_running = 0;
+       ++current_hook;
+       run_hooklist();
+}
+
+static struct uloop_process hook_process = {
+       .cb = hook_process_handler,
+};
+
+static void hook_process_timeout_cb(struct uloop_timeout *t)
+{
+       DEBUG("hook process failed to stop, sending SIGKILL\n");
+       kill(hook_process.pid, SIGKILL);
+}
+
+static void run_hooklist(void)
 {
+       struct hook_execvpe *hook = *current_hook;
        struct stat s;
-       char new[PATH_MAX];
-       int fd;
 
-       if (stat(path, &s)) {
-               ERROR("stat(%s) failed: %s\n", path, strerror(errno));
-               return error;
+       if (!hook)
+               hook_return_cb();
+
+       DEBUG("executing hook %s\n", hook->file);
+
+       if (stat(hook->file, &s))
+               hook_process_handler(&hook_process, ENOENT);
+
+       if (!((unsigned long)s.st_mode & (S_IXUSR | S_IXGRP | S_IXOTH)))
+               hook_process_handler(&hook_process, EPERM);
+
+       if (!((unsigned long)s.st_mode & (S_IRUSR | S_IRGRP | S_IROTH)))
+               hook_process_handler(&hook_process, EPERM);
+
+       hook_running = 1;
+       hook_process.pid = fork();
+       if (hook_process.pid == 0) {
+               /* child */
+               execve(hook->file, hook->argv, hook->envp);
+               ERROR("execve error %m\n");
+               _exit(errno);
+       } else if (hook_process.pid < 0) {
+               /* fork error */
+               ERROR("hook fork error\n");
+               hook_running = 0;
+               hook_process_handler(&hook_process, errno);
+       }
+
+       /* parent */
+       uloop_process_add(&hook_process);
+
+       if (hook->timeout > 0)
+               uloop_timeout_set(&hook_process_timeout, 1000 * hook->timeout);
+
+       uloop_run();
+       if (hook_running) {
+               DEBUG("uloop interrupted, killing jail process\n");
+               kill(hook_process.pid, SIGTERM);
+               uloop_timeout_set(&hook_process_timeout, 1000);
+               uloop_run();
+       }
+}
+
+static void run_hooks(struct hook_execvpe **hooklist, hook_return_handler return_cb)
+{
+       if (!hooklist)
+               return_cb();
+
+       current_hook = hooklist;
+       hook_return_cb = return_cb;
+
+       run_hooklist();
+}
+
+static int apply_sysctl(const char *jail_root)
+{
+       struct sysctl_val **cur;
+       char *procdir, *fname;
+       int f;
+
+       if (!opts.sysctl)
+               return 0;
+
+       asprintf(&procdir, "%s/proc", jail_root);
+       if (!procdir)
+               return ENOMEM;
+
+       mkdir(procdir, 0700);
+       if (mount("proc", procdir, "proc", MS_NOATIME | MS_NODEV | MS_NOEXEC | MS_NOSUID, 0))
+               return EPERM;
+
+       cur = opts.sysctl;
+
+       while (*cur) {
+               asprintf(&fname, "%s/sys/%s", procdir, (*cur)->entry);
+               if (!fname)
+                       return ENOMEM;
+
+               DEBUG("sysctl: writing '%s' to %s\n", (*cur)->value, fname);
+
+               f = open(fname, O_WRONLY);
+               if (f == -1) {
+                       ERROR("sysctl: can't open %s\n", fname);
+                       return errno;
+               }
+               write(f, (*cur)->value, strlen((*cur)->value));
+
+               free(fname);
+               close(f);
+               ++cur;
+       }
+       umount(procdir);
+       rmdir(procdir);
+       free(procdir);
+
+       return 0;
+}
+
+/* glibc defines makedev calling a function. make sure it's a pure macro */
+#if defined(__GLIBC__)
+#undef makedev
+/* from musl's sys/sysmacros.h */
+#define makedev(x,y) ( \
+       (((x)&0xfffff000ULL) << 32) | \
+       (((x)&0x00000fffULL) << 8) | \
+       (((y)&0xffffff00ULL) << 12) | \
+       (((y)&0x000000ffULL)) )
+#endif
+
+static struct mknod_args default_devices[] = {
+       { .path = "/dev/null", .mode = (S_IFCHR|S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP|S_IROTH|S_IWOTH), .dev = makedev(1, 3) },
+       { .path = "/dev/zero", .mode = (S_IFCHR|S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP|S_IROTH|S_IWOTH), .dev = makedev(1, 5) },
+       { .path = "/dev/full", .mode = (S_IFCHR|S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP|S_IROTH|S_IWOTH), .dev = makedev(1, 7) },
+       { .path = "/dev/random", .mode = (S_IFCHR|S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP|S_IROTH|S_IWOTH), .dev = makedev(1, 8) },
+       { .path = "/dev/urandom", .mode = (S_IFCHR|S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP|S_IROTH|S_IWOTH), .dev = makedev(1, 9) },
+       { .path = "/dev/tty", .mode = (S_IFCHR|S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP), .dev = makedev(5, 0), .gid = 5 },
+       { 0 },
+};
+
+static int create_devices(void)
+{
+       struct mknod_args **cur, *curdef;
+
+       if (!opts.devices)
+               goto only_default_devices;
+
+       cur = opts.devices;
+
+       while (*cur) {
+               DEBUG("creating %s (mode=%08o)\n", (*cur)->path, (*cur)->mode);
+               if (mknod((*cur)->path, (*cur)->mode, (*cur)->dev))
+                       return errno;
+
+               if (((*cur)->uid || (*cur)->gid) &&
+                   chown((*cur)->path, (*cur)->uid, (*cur)->gid))
+                       return errno;
+
+               ++cur;
+       }
+
+only_default_devices:
+       curdef = default_devices;
+       while(curdef->path) {
+               DEBUG("creating %s (mode=%08o)\n", curdef->path, curdef->mode);
+               if (mknod(curdef->path, curdef->mode, curdef->dev)) {
+                       ++curdef;
+                       continue; /* may already exist, eg. due to a bind-mount */
+               }
+               if ((curdef->uid || curdef->gid) &&
+                   chown(curdef->path, curdef->uid, curdef->gid))
+                       return errno;
+
+               ++curdef;
+       }
+
+       /* Dev symbolic links as defined in OCI spec */
+       symlink("/dev/pts/ptmx", "/dev/ptmx");
+       symlink("/proc/self/fd", "/dev/fd");
+       symlink("/proc/self/fd/0", "/dev/stdin");
+       symlink("/proc/self/fd/1", "/dev/stdout");
+       symlink("/proc/self/fd/2", "/dev/stderr");
+
+       return 0;
+}
+
+static char jail_root[] = "/tmp/ujail-XXXXXX";
+static char tmpovdir[] = "/tmp/ujail-overlay-XXXXXX";
+static mode_t old_umask;
+static void enter_jail_fs(void);
+static int build_jail_fs(void)
+{
+       char *overlaydir = NULL;
+
+       old_umask = umask(0);
+
+       if (mkdtemp(jail_root) == NULL) {
+               ERROR("mkdtemp(%s) failed: %m\n", jail_root);
+               return -1;
        }
 
-       snprintf(new, sizeof(new), "%s%s", root, path);
-       if (S_ISDIR(s.st_mode)) {
-               mkdir_p(new, 0755);
+       if (apply_sysctl(jail_root)) {
+               ERROR("failed to apply sysctl values\n");
+               return -1;
+       }
+
+       /* oldroot can't be MS_SHARED else pivot_root() fails */
+       if (mount("none", "/", "none", MS_REC|MS_PRIVATE, NULL)) {
+               ERROR("private mount failed %m\n");
+               return -1;
+       }
+
+       if (opts.extroot) {
+               if (mount(opts.extroot, jail_root, "bind", MS_BIND, NULL)) {
+                       ERROR("extroot mount failed %m\n");
+                       return -1;
+               }
        } else {
-               mkdir_p(dirname(new), 0755);
-               snprintf(new, sizeof(new), "%s%s", root, path);
-               fd = creat(new, 0644);
-               if (fd == -1) {
-                       ERROR("failed to create %s: %s\n", new, strerror(errno));
+               if (mount("tmpfs", jail_root, "tmpfs", MS_NOATIME, "mode=0755")) {
+                       ERROR("tmpfs mount failed %m\n");
                        return -1;
                }
-               close(fd);
        }
 
-       if (mount(path, new, NULL, MS_BIND, NULL)) {
-               ERROR("failed to mount -B %s %s: %s\n", path, new, strerror(errno));
-               return -1;
+       if (opts.tmpoverlaysize) {
+               char mountoptsstr[] = "mode=0755,size=XXXXXXXX";
+
+               snprintf(mountoptsstr, sizeof(mountoptsstr),
+                        "mode=0755,size=%s", opts.tmpoverlaysize);
+               if (mkdtemp(tmpovdir) == NULL) {
+                       ERROR("mkdtemp(%s) failed: %m\n", jail_root);
+                       return -1;
+               }
+               if (mount("tmpfs", tmpovdir, "tmpfs", MS_NOATIME,
+                         mountoptsstr)) {
+                       ERROR("failed to mount tmpfs for overlay (size=%s)\n", opts.tmpoverlaysize);
+                       return -1;
+               }
+               overlaydir = tmpovdir;
+       }
+
+       if (opts.overlaydir)
+               overlaydir = opts.overlaydir;
+
+       if (overlaydir)
+               mount_overlay(jail_root, overlaydir);
+
+       if (chdir(jail_root)) {
+               ERROR("chdir(%s) (jail_root) failed: %m\n", jail_root);
+               return -1;
+       }
+
+       if (mount_all(jail_root)) {
+               ERROR("mount_all() failed\n");
+               return -1;
+       }
+
+       if (opts.console)
+               create_dev_console(jail_root);
+
+       /* make sure /etc/resolv.conf exists if in new network namespace */
+       if (opts.namespace & CLONE_NEWNET) {
+               char jailetc[PATH_MAX], jaillink[PATH_MAX];
+
+               snprintf(jailetc, PATH_MAX, "%s/etc", jail_root);
+               mkdir_p(jailetc, 0755);
+               snprintf(jaillink, PATH_MAX, "%s/etc/resolv.conf", jail_root);
+               if (overlaydir)
+                       unlink(jaillink);
+
+               symlink("../dev/resolv.conf.d/resolv.conf.auto", jaillink);
+       }
+
+       run_hooks(opts.hooks.createContainer, enter_jail_fs);
+
+       return 0;
+}
+
+static bool exit_from_child;
+static void free_and_exit(int ret)
+{
+       if (!exit_from_child && opts.ocibundle)
+               cgroups_free();
+
+       if (!exit_from_child && parent_ctx)
+               ubus_free(parent_ctx);
+
+       free_opts(!exit_from_child);
+
+       exit(ret);
+}
+
+static void post_jail_fs(void);
+static void enter_jail_fs(void)
+{
+       char dirbuf[sizeof(jail_root) + 4];
+
+       snprintf(dirbuf, sizeof(dirbuf), "%s/old", jail_root);
+       mkdir(dirbuf, 0755);
+
+       if (pivot_root(jail_root, dirbuf) == -1) {
+               ERROR("pivot_root(%s, %s) failed: %m\n", jail_root, dirbuf);
+               free_and_exit(-1);
+       }
+       if (chdir("/")) {
+               ERROR("chdir(/) (after pivot_root) failed: %m\n");
+               free_and_exit(-1);
+       }
+
+       snprintf(dirbuf, sizeof(dirbuf), "/old%s", jail_root);
+       umount2(dirbuf, MNT_DETACH);
+       rmdir(dirbuf);
+       if (opts.tmpoverlaysize) {
+               char tmpdirbuf[sizeof(tmpovdir) + 4];
+               snprintf(tmpdirbuf, sizeof(tmpdirbuf), "/old%s", tmpovdir);
+               umount2(tmpdirbuf, MNT_DETACH);
+               rmdir(tmpdirbuf);
+       }
+
+       umount2("/old", MNT_DETACH);
+       rmdir("/old");
+
+       if (create_devices()) {
+               ERROR("create_devices() failed\n");
+               free_and_exit(-1);
+       }
+       if (opts.ronly)
+               mount(NULL, "/", "bind", MS_REMOUNT | MS_BIND | MS_RDONLY, 0);
+
+       umask(old_umask);
+       post_jail_fs();
+}
+
+static int write_uid_gid_map(pid_t child_pid, bool gidmap, char *mapstr)
+{
+       int map_file;
+       char map_path[64];
+
+       if (snprintf(map_path, sizeof(map_path), "/proc/%d/%s",
+               child_pid, gidmap?"gid_map":"uid_map") < 0)
+               return -1;
+
+       if ((map_file = open(map_path, O_WRONLY)) == -1)
+               return -1;
+
+       if (dprintf(map_file, "%s", mapstr)) {
+               close(map_file);
+               return -1;
+       }
+
+       close(map_file);
+       return 0;
+}
+
+static int write_single_uid_gid_map(pid_t child_pid, bool gidmap, int id)
+{
+       int map_file;
+       char map_path[64];
+       const char *map_format = "%d %d %d\n";
+       if (snprintf(map_path, sizeof(map_path), "/proc/%d/%s",
+               child_pid, gidmap?"gid_map":"uid_map") < 0)
+               return -1;
+
+       if ((map_file = open(map_path, O_WRONLY)) == -1)
+               return -1;
+
+       if (dprintf(map_file, map_format, 0, id, 1) == -1) {
+               close(map_file);
+               return -1;
+       }
+
+       close(map_file);
+       return 0;
+}
+
+static int write_setgroups(pid_t child_pid, bool allow)
+{
+       int setgroups_file;
+       char setgroups_path[64];
+
+       if (snprintf(setgroups_path, sizeof(setgroups_path), "/proc/%d/setgroups",
+               child_pid) < 0) {
+               return -1;
+       }
+
+       if ((setgroups_file = open(setgroups_path, O_WRONLY)) == -1) {
+               return -1;
+       }
+
+       if (dprintf(setgroups_file, "%s", allow?"allow":"deny") == -1) {
+               close(setgroups_file);
+               return -1;
+       }
+
+       close(setgroups_file);
+       return 0;
+}
+
+static void get_jail_user(int *user, int *user_gid, int *gr_gid)
+{
+       struct passwd *p = NULL;
+       struct group *g = NULL;
+
+       if (opts.user) {
+               p = getpwnam(opts.user);
+               if (!p) {
+                       ERROR("failed to get uid/gid for user %s: %d (%s)\n",
+                             opts.user, errno, strerror(errno));
+                       free_and_exit(EXIT_FAILURE);
+               }
+               *user = p->pw_uid;
+               *user_gid = p->pw_gid;
+       } else {
+               *user = -1;
+               *user_gid = -1;
+       }
+
+       if (opts.group) {
+               g = getgrnam(opts.group);
+               if (!g) {
+                       ERROR("failed to get gid for group %s: %m\n", opts.group);
+                       free_and_exit(EXIT_FAILURE);
+               }
+               *gr_gid = g->gr_gid;
+       } else {
+               *gr_gid = -1;
+       }
+};
+
+static void set_jail_user(int pw_uid, int user_gid, int gr_gid)
+{
+       if (opts.user && (user_gid != -1) && initgroups(opts.user, user_gid)) {
+               ERROR("failed to initgroups() for user %s: %m\n", opts.user);
+               free_and_exit(EXIT_FAILURE);
+       }
+
+       if ((gr_gid != -1) && setregid(gr_gid, gr_gid)) {
+               ERROR("failed to set group id %d: %m\n", gr_gid);
+               free_and_exit(EXIT_FAILURE);
+       }
+
+       if ((pw_uid != -1) && setreuid(pw_uid, pw_uid)) {
+               ERROR("failed to set user id %d: %m\n", pw_uid);
+               free_and_exit(EXIT_FAILURE);
+       }
+}
+
+static int apply_rlimits(void)
+{
+       int resource;
+
+       for (resource = 0; resource < RLIM_NLIMITS; ++resource) {
+               if (opts.rlimits[resource])
+                       DEBUG("applying limits to resource %u\n", resource);
+
+               if (opts.rlimits[resource] &&
+                   setrlimit(resource, opts.rlimits[resource]))
+                       return errno;
+       }
+
+       return 0;
+}
+
+#define MAX_ENVP       16
+static char** build_envp(const char *seccomp, char **ocienvp)
+{
+       static char *envp[MAX_ENVP];
+       static char preload_var[PATH_MAX];
+       static char seccomp_var[PATH_MAX];
+       static char seccomp_debug_var[20];
+       static char debug_var[] = "LD_DEBUG=all";
+       static char container_var[] = "container=ujail";
+       const char *preload_lib = find_lib("libpreload-seccomp.so");
+       char **addenv;
+
+       int count = 0;
+
+       if (seccomp && !preload_lib) {
+               ERROR("failed to add preload-lib to env\n");
+               return NULL;
+       }
+       if (seccomp) {
+               snprintf(seccomp_var, sizeof(seccomp_var), "SECCOMP_FILE=%s", seccomp);
+               envp[count++] = seccomp_var;
+               snprintf(seccomp_debug_var, sizeof(seccomp_debug_var), "SECCOMP_DEBUG=%2d", debug);
+               envp[count++] = seccomp_debug_var;
+               snprintf(preload_var, sizeof(preload_var), "LD_PRELOAD=%s", preload_lib);
+               envp[count++] = preload_var;
+       }
+
+       envp[count++] = container_var;
+
+       if (debug > 1)
+               envp[count++] = debug_var;
+
+       addenv = ocienvp;
+       while (addenv && *addenv) {
+               envp[count++] = *(addenv++);
+               if (count >= MAX_ENVP) {
+                       ERROR("environment limited to %d extra records, truncating\n", MAX_ENVP);
+                       break;
+               }
+       }
+       return envp;
+}
+
+static void usage(void)
+{
+       fprintf(stderr, "ujail <options> -- <binary> <params ...>\n");
+       fprintf(stderr, "  -d <num>\tshow debug log (increase num to increase verbosity)\n");
+       fprintf(stderr, "  -S <file>\tseccomp filter config\n");
+       fprintf(stderr, "  -C <file>\tcapabilities drop config\n");
+       fprintf(stderr, "  -c\t\tset PR_SET_NO_NEW_PRIVS\n");
+       fprintf(stderr, "  -n <name>\tthe name of the jail\n");
+       fprintf(stderr, "namespace jail options:\n");
+       fprintf(stderr, "  -h <hostname>\tchange the hostname of the jail\n");
+       fprintf(stderr, "  -N\t\tjail has network namespace\n");
+       fprintf(stderr, "  -f\t\tjail has user namespace\n");
+       fprintf(stderr, "  -F\t\tjail has cgroups namespace\n");
+       fprintf(stderr, "  -r <file>\treadonly files that should be staged\n");
+       fprintf(stderr, "  -w <file>\twriteable files that should be staged\n");
+       fprintf(stderr, "  -p\t\tjail has /proc\n");
+       fprintf(stderr, "  -s\t\tjail has /sys\n");
+       fprintf(stderr, "  -l\t\tjail has /dev/log\n");
+       fprintf(stderr, "  -u\t\tjail has a ubus socket\n");
+       fprintf(stderr, "  -U <name>\tuser to run jailed process\n");
+       fprintf(stderr, "  -G <name>\tgroup to run jailed process\n");
+       fprintf(stderr, "  -o\t\tremont jail root (/) read only\n");
+       fprintf(stderr, "  -R <dir>\texternal jail rootfs (system container)\n");
+       fprintf(stderr, "  -O <dir>\tdirectory for r/w overlayfs\n");
+       fprintf(stderr, "  -T <size>\tuse tmpfs r/w overlayfs with <size>\n");
+       fprintf(stderr, "  -E\t\tfail if jail cannot be setup\n");
+       fprintf(stderr, "  -y\t\tprovide jail console\n");
+       fprintf(stderr, "  -J <dir>\tcreate container from OCI bundle\n");
+       fprintf(stderr, "  -i\t\tstart container immediately\n");
+       fprintf(stderr, "  -P <pidfile>\tcreate <pidfile>\n");
+       fprintf(stderr, "\nWarning: by default root inside the jail is the same\n\
+and he has the same powers as root outside the jail,\n\
+thus he can escape the jail and/or break stuff.\n\
+Please use seccomp/capabilities (-S/-C) to restrict his powers\n\n\
+If you use none of the namespace jail options,\n\
+ujail will not use namespace/build a jail,\n\
+and will only drop capabilities/apply seccomp filter.\n\n");
+}
+
+static int* get_namespace_fd(const unsigned int nstype)
+{
+       switch (nstype) {
+               case CLONE_NEWPID:
+                       return &opts.setns.pid;
+               case CLONE_NEWNET:
+                       return &opts.setns.net;
+               case CLONE_NEWNS:
+                       return &opts.setns.ns;
+               case CLONE_NEWIPC:
+                       return &opts.setns.ipc;
+               case CLONE_NEWUTS:
+                       return &opts.setns.uts;
+               case CLONE_NEWUSER:
+                       return &opts.setns.user;
+               case CLONE_NEWCGROUP:
+                       return &opts.setns.cgroup;
+#ifdef CLONE_NEWTIME
+               case CLONE_NEWTIME:
+                       return &opts.setns.time;
+#endif
+               default:
+                       return NULL;
+       }
+}
+
+static int setns_open(unsigned long nstype)
+{
+       int *fd = get_namespace_fd(nstype);
+
+       assert(fd != NULL);
+
+       if (*fd == -1)
+               return 0;
+
+       if (setns(*fd, nstype) == -1) {
+               close(*fd);
+               return errno;
+       }
+
+       close(*fd);
+       return 0;
+}
+
+static int jail_running = 0;
+static int jail_return_code = 0;
+
+static void jail_process_timeout_cb(struct uloop_timeout *t);
+static struct uloop_timeout jail_process_timeout = {
+       .cb = jail_process_timeout_cb,
+};
+static void poststop(void);
+static void jail_process_handler(struct uloop_process *c, int ret)
+{
+       uloop_timeout_cancel(&jail_process_timeout);
+       if (WIFEXITED(ret)) {
+               jail_return_code = WEXITSTATUS(ret);
+               INFO("jail (%d) exited with exit: %d\n", c->pid, jail_return_code);
+       } else {
+               jail_return_code = WTERMSIG(ret);
+               INFO("jail (%d) exited with signal: %d\n", c->pid, jail_return_code);
+       }
+       jail_running = 0;
+       poststop();
+}
+
+static struct uloop_process jail_process = {
+       .cb = jail_process_handler,
+};
+
+static void jail_process_timeout_cb(struct uloop_timeout *t)
+{
+       DEBUG("jail process failed to stop, sending SIGKILL\n");
+       kill(jail_process.pid, SIGKILL);
+}
+
+static void jail_handle_signal(int signo)
+{
+       if (hook_running) {
+               DEBUG("forwarding signal %d to the hook process\n", signo);
+               kill(hook_process.pid, signo);
+       }
+
+       if (jail_running) {
+               DEBUG("forwarding signal %d to the jailed process\n", signo);
+               kill(jail_process.pid, signo);
+       }
+}
+
+static void signals_init(void)
+{
+       int i;
+       sigset_t sigmask;
+
+       sigfillset(&sigmask);
+       for (i = 0; i < _NSIG; i++) {
+               struct sigaction s = { 0 };
+
+               if (!sigismember(&sigmask, i))
+                       continue;
+               if ((i == SIGCHLD) || (i == SIGPIPE) || (i == SIGSEGV))
+                       continue;
+
+               s.sa_handler = jail_handle_signal;
+               sigaction(i, &s, NULL);
+       }
+}
+
+static void pre_exec_jail(struct uloop_timeout *t);
+static struct uloop_timeout pre_exec_timeout = {
+       .cb = pre_exec_jail,
+};
+
+int pipes[4];
+static int exec_jail(void *arg)
+{
+       char buf[1];
+
+       exit_from_child = true;
+       prctl(PR_SET_SECUREBITS, 0);
+
+       uloop_init();
+       signals_init();
+
+       close(pipes[0]);
+       close(pipes[3]);
+
+       setns_open(CLONE_NEWUSER);
+       setns_open(CLONE_NEWNET);
+       setns_open(CLONE_NEWNS);
+       setns_open(CLONE_NEWIPC);
+       setns_open(CLONE_NEWUTS);
+
+       buf[0] = 'i';
+       if (write(pipes[1], buf, 1) < 1) {
+               ERROR("can't write to parent\n");
+               return EXIT_FAILURE;
+       }
+       close(pipes[1]);
+       if (read(pipes[2], buf, 1) < 1) {
+               ERROR("can't read from parent\n");
+               return EXIT_FAILURE;
+       }
+       if (buf[0] != 'O') {
+               ERROR("parent had an error, child exiting\n");
+               return EXIT_FAILURE;
+       }
+
+       if (opts.namespace & CLONE_NEWCGROUP)
+               unshare(CLONE_NEWCGROUP);
+
+       setns_open(CLONE_NEWCGROUP);
+
+       if ((opts.namespace & CLONE_NEWUSER) || (opts.setns.user != -1)) {
+               if (setregid(0, 0) < 0) {
+                       ERROR("setgid\n");
+                       free_and_exit(EXIT_FAILURE);
+               }
+               if (setreuid(0, 0) < 0) {
+                       ERROR("setuid\n");
+                       free_and_exit(EXIT_FAILURE);
+               }
+               if (setgroups(0, NULL) < 0) {
+                       ERROR("setgroups\n");
+                       free_and_exit(EXIT_FAILURE);
+               }
+       }
+
+       if (opts.namespace && opts.hostname && strlen(opts.hostname) > 0
+                       && sethostname(opts.hostname, strlen(opts.hostname))) {
+               ERROR("sethostname(%s) failed: %m\n", opts.hostname);
+               free_and_exit(EXIT_FAILURE);
+       }
+
+       uloop_timeout_add(&pre_exec_timeout);
+       uloop_run();
+
+       free_and_exit(-1);
+       return -1;
+}
+
+static void pre_exec_jail(struct uloop_timeout *t)
+{
+       if ((opts.namespace & CLONE_NEWNS) && build_jail_fs()) {
+               ERROR("failed to build jail fs\n");
+               free_and_exit(EXIT_FAILURE);
+       } else {
+               run_hooks(opts.hooks.createContainer, post_jail_fs);
+       }
+}
+
+static void post_start_hook(void);
+static void post_jail_fs(void)
+{
+       char buf[1];
+
+       if (read(pipes[2], buf, 1) < 1) {
+               ERROR("can't read from parent\n");
+               free_and_exit(EXIT_FAILURE);
+       }
+       if (buf[0] != '!') {
+               ERROR("parent had an error, child exiting\n");
+               free_and_exit(EXIT_FAILURE);
+       }
+       close(pipes[2]);
+
+       run_hooks(opts.hooks.startContainer, post_start_hook);
+}
+
+static void post_start_hook(void)
+{
+       int pw_uid, pw_gid, gr_gid;
+
+       /*
+        * make sure setuid/setgid won't drop capabilities in case capabilities
+        * have been specified explicitely.
+        */
+       if (opts.capset.apply) {
+               if (prctl(PR_SET_SECUREBITS, SECBIT_NO_SETUID_FIXUP)) {
+                       ERROR("prctl(PR_SET_SECUREBITS) failed: %m\n");
+                       free_and_exit(EXIT_FAILURE);
+               }
+       }
+
+       /* drop capabilities, retain those still needed to further setup jail */
+       if (applyOCIcapabilities(opts.capset, (1LLU << CAP_SETGID) | (1LLU << CAP_SETUID) | (1LLU << CAP_SETPCAP)))
+               free_and_exit(EXIT_FAILURE);
+
+       /* use either cmdline-supplied user/group or uid/gid from OCI spec */
+       get_jail_user(&pw_uid, &pw_gid, &gr_gid);
+       set_jail_user(opts.pw_uid?:pw_uid, opts.pw_gid?:pw_gid, opts.gr_gid?:gr_gid);
+
+       if (opts.additional_gids &&
+           (setgroups(opts.num_additional_gids, opts.additional_gids) < 0)) {
+               ERROR("setgroups failed: %m\n");
+               free_and_exit(EXIT_FAILURE);
+       }
+
+       if (opts.set_umask)
+               umask(opts.umask);
+
+       /* restore securebits back to normal (and lock them if not in userns) */
+       if (opts.capset.apply) {
+               if (prctl(PR_SET_SECUREBITS, (opts.namespace & CLONE_NEWUSER)?0:
+                   SECBIT_KEEP_CAPS_LOCKED|SECBIT_NO_SETUID_FIXUP_LOCKED|SECBIT_NOROOT_LOCKED)) {
+                       ERROR("prctl(PR_SET_SECUREBITS) failed: %m\n");
+                       free_and_exit(EXIT_FAILURE);
+               }
+       }
+
+       /* drop remaining capabilities to end up with specified sets */
+       if (applyOCIcapabilities(opts.capset, 0))
+               free_and_exit(EXIT_FAILURE);
+
+       if (opts.no_new_privs && prctl(PR_SET_NO_NEW_PRIVS, 1, 0, 0, 0)) {
+               ERROR("prctl(PR_SET_NO_NEW_PRIVS) failed: %m\n");
+               free_and_exit(EXIT_FAILURE);
+       }
+
+       char **envp = build_envp(opts.seccomp, opts.envp);
+       if (!envp)
+               free_and_exit(EXIT_FAILURE);
+
+       if (opts.cwd && chdir(opts.cwd))
+               free_and_exit(EXIT_FAILURE);
+
+       if (opts.ociseccomp && applyOCIlinuxseccomp(opts.ociseccomp))
+               free_and_exit(EXIT_FAILURE);
+
+       uloop_end();
+       free_opts(false);
+       INFO("exec-ing %s\n", *opts.jail_argv);
+       if (opts.envp) /* respect PATH if potentially set in ENV */
+               execvpe(*opts.jail_argv, opts.jail_argv, envp);
+       else
+               execve(*opts.jail_argv, opts.jail_argv, envp);
+
+       /* we get there only if execve fails */
+       ERROR("failed to execve %s: %m\n", *opts.jail_argv);
+       exit(EXIT_FAILURE);
+}
+
+static int ns_open_pid(const char *nstype, const pid_t target_ns)
+{
+       char pid_pid_path[PATH_MAX];
+
+       snprintf(pid_pid_path, sizeof(pid_pid_path), "/proc/%u/ns/%s", target_ns, nstype);
+
+       return open(pid_pid_path, O_RDONLY);
+}
+
+static void netns_updown(pid_t pid, bool start)
+{
+       static struct blob_buf req;
+       uint32_t id;
+
+       if (!parent_ctx)
+               return;
+
+       blob_buf_init(&req, 0);
+       blobmsg_add_string(&req, "jail", opts.name);
+       blobmsg_add_u32(&req, "pid", pid);
+       blobmsg_add_u8(&req, "start", start);
+
+       if (ubus_lookup_id(parent_ctx, "network", &id) ||
+           ubus_invoke(parent_ctx, id, "netns_updown", req.head, NULL, NULL, 3000))
+               INFO("ubus request failed\n");
+
+       blob_buf_free(&req);
+}
+
+static int parseOCIenvarray(struct blob_attr *msg, char ***envp)
+{
+       struct blob_attr *cur;
+       int sz = 0, rem;
+
+       blobmsg_for_each_attr(cur, msg, rem)
+               ++sz;
+
+       if (sz > 0) {
+               *envp = calloc(1 + sz, sizeof(char*));
+               if (!(*envp))
+                       return ENOMEM;
+       } else {
+               *envp = NULL;
+               return 0;
+       }
+
+       sz = 0;
+       blobmsg_for_each_attr(cur, msg, rem)
+               (*envp)[sz++] = strdup(blobmsg_get_string(cur));
+
+       if (sz)
+               (*envp)[sz] = NULL;
+
+       return 0;
+}
+
+enum {
+       OCI_ROOT_PATH,
+       OCI_ROOT_READONLY,
+       __OCI_ROOT_MAX,
+};
+
+static const struct blobmsg_policy oci_root_policy[] = {
+       [OCI_ROOT_PATH] = { "path", BLOBMSG_TYPE_STRING },
+       [OCI_ROOT_READONLY] = { "readonly", BLOBMSG_TYPE_BOOL },
+};
+
+static int parseOCIroot(const char *jsonfile, struct blob_attr *msg)
+{
+       static char extroot[PATH_MAX] = { 0 };
+       struct blob_attr *tb[__OCI_ROOT_MAX];
+       char *cur;
+       char *root_path;
+
+       blobmsg_parse(oci_root_policy, __OCI_ROOT_MAX, tb, blobmsg_data(msg), blobmsg_len(msg));
+
+       if (!tb[OCI_ROOT_PATH])
+               return ENODATA;
+
+       root_path = blobmsg_get_string(tb[OCI_ROOT_PATH]);
+
+       /* prepend bundle directory in case of relative paths */
+       if (root_path[0] != '/') {
+               strncpy(extroot, jsonfile, PATH_MAX);
+               cur = strrchr(extroot, '/');
+
+               if (!cur)
+                       return ENOTDIR;
+
+               *(++cur) = '\0';
+       }
+
+       strncat(extroot, root_path, PATH_MAX - (strlen(extroot) + 1));
+
+       opts.extroot = extroot;
+
+       if (tb[OCI_ROOT_READONLY])
+               opts.ronly = blobmsg_get_bool(tb[OCI_ROOT_READONLY]);
+
+       return 0;
+}
+
+
+enum {
+       OCI_HOOK_PATH,
+       OCI_HOOK_ARGS,
+       OCI_HOOK_ENV,
+       OCI_HOOK_TIMEOUT,
+       __OCI_HOOK_MAX,
+};
+
+static const struct blobmsg_policy oci_hook_policy[] = {
+       [OCI_HOOK_PATH] = { "path", BLOBMSG_TYPE_STRING },
+       [OCI_HOOK_ARGS] = { "args", BLOBMSG_TYPE_ARRAY },
+       [OCI_HOOK_ENV] = { "env", BLOBMSG_TYPE_ARRAY },
+       [OCI_HOOK_TIMEOUT] = { "timeout", BLOBMSG_TYPE_INT32 },
+};
+
+
+static int parseOCIhook(struct hook_execvpe ***hooklist, struct blob_attr *msg)
+{
+       struct blob_attr *tb[__OCI_HOOK_MAX];
+       struct blob_attr *cur;
+       int rem, ret = 0;
+       int idx = 0;
+
+       blobmsg_for_each_attr(cur, msg, rem)
+               ++idx;
+
+       if (!idx)
+               return 0;
+
+       *hooklist = calloc(idx + 1, sizeof(struct hook_execvpe *));
+       idx = 0;
+
+       if (!(*hooklist))
+               return ENOMEM;
+
+       blobmsg_for_each_attr(cur, msg, rem) {
+               blobmsg_parse(oci_hook_policy, __OCI_HOOK_MAX, tb, blobmsg_data(cur), blobmsg_len(cur));
+
+               if (!tb[OCI_HOOK_PATH]) {
+                       ret = EINVAL;
+                       goto errout;
+               }
+
+               (*hooklist)[idx] = calloc(1, sizeof(struct hook_execvpe));
+               if (tb[OCI_HOOK_ARGS]) {
+                       ret = parseOCIenvarray(tb[OCI_HOOK_ARGS], &((*hooklist)[idx]->argv));
+                       if (ret)
+                               goto errout;
+               } else {
+                       (*hooklist)[idx]->argv = calloc(2, sizeof(char *));
+                       ((*hooklist)[idx]->argv)[0] = strdup(blobmsg_get_string(tb[OCI_HOOK_PATH]));
+                       ((*hooklist)[idx]->argv)[1] = NULL;
+               };
+
+
+               if (tb[OCI_HOOK_ENV]) {
+                       ret = parseOCIenvarray(tb[OCI_HOOK_ENV], &((*hooklist)[idx]->envp));
+                       if (ret)
+                               goto errout;
+               }
+
+               if (tb[OCI_HOOK_TIMEOUT])
+                       (*hooklist)[idx]->timeout = blobmsg_get_u32(tb[OCI_HOOK_TIMEOUT]);
+
+               (*hooklist)[idx]->file = strdup(blobmsg_get_string(tb[OCI_HOOK_PATH]));
+
+               ++idx;
+       }
+
+       (*hooklist)[idx] = NULL;
+
+       DEBUG("added %d hooks\n", idx);
+
+       return 0;
+
+errout:
+       free_hooklist(*hooklist);
+       *hooklist = NULL;
+
+       return ret;
+};
+
+
+enum {
+       OCI_HOOKS_PRESTART,
+       OCI_HOOKS_CREATERUNTIME,
+       OCI_HOOKS_CREATECONTAINER,
+       OCI_HOOKS_STARTCONTAINER,
+       OCI_HOOKS_POSTSTART,
+       OCI_HOOKS_POSTSTOP,
+       __OCI_HOOKS_MAX,
+};
+
+static const struct blobmsg_policy oci_hooks_policy[] = {
+       [OCI_HOOKS_PRESTART] = { "prestart", BLOBMSG_TYPE_ARRAY },
+       [OCI_HOOKS_CREATERUNTIME] = { "createRuntime", BLOBMSG_TYPE_ARRAY },
+       [OCI_HOOKS_CREATECONTAINER] = { "createContainer", BLOBMSG_TYPE_ARRAY },
+       [OCI_HOOKS_STARTCONTAINER] = { "startContainer", BLOBMSG_TYPE_ARRAY },
+       [OCI_HOOKS_POSTSTART] = { "poststart", BLOBMSG_TYPE_ARRAY },
+       [OCI_HOOKS_POSTSTOP] = { "poststop", BLOBMSG_TYPE_ARRAY },
+};
+
+static int parseOCIhooks(struct blob_attr *msg)
+{
+       struct blob_attr *tb[__OCI_HOOKS_MAX];
+       int ret;
+
+       blobmsg_parse(oci_hooks_policy, __OCI_HOOKS_MAX, tb, blobmsg_data(msg), blobmsg_len(msg));
+
+       if (tb[OCI_HOOKS_PRESTART])
+               INFO("warning: ignoring deprecated prestart hook\n");
+
+       if (tb[OCI_HOOKS_CREATERUNTIME]) {
+               ret = parseOCIhook(&opts.hooks.createRuntime, tb[OCI_HOOKS_CREATERUNTIME]);
+               if (ret)
+                       return ret;
+       }
+
+       if (tb[OCI_HOOKS_CREATECONTAINER]) {
+               ret = parseOCIhook(&opts.hooks.createContainer, tb[OCI_HOOKS_CREATECONTAINER]);
+               if (ret)
+                       goto out_createruntime;
+       }
+
+       if (tb[OCI_HOOKS_STARTCONTAINER]) {
+               ret = parseOCIhook(&opts.hooks.startContainer, tb[OCI_HOOKS_STARTCONTAINER]);
+               if (ret)
+                       goto out_createcontainer;
+       }
+
+       if (tb[OCI_HOOKS_POSTSTART]) {
+               ret = parseOCIhook(&opts.hooks.poststart, tb[OCI_HOOKS_POSTSTART]);
+               if (ret)
+                       goto out_startcontainer;
+       }
+
+       if (tb[OCI_HOOKS_POSTSTOP]) {
+               ret = parseOCIhook(&opts.hooks.poststop, tb[OCI_HOOKS_POSTSTOP]);
+               if (ret)
+                       goto out_poststart;
+       }
+
+       return 0;
+
+out_poststart:
+       free_hooklist(opts.hooks.poststart);
+out_startcontainer:
+       free_hooklist(opts.hooks.startContainer);
+out_createcontainer:
+       free_hooklist(opts.hooks.createContainer);
+out_createruntime:
+       free_hooklist(opts.hooks.createRuntime);
+
+       return ret;
+};
+
+
+enum {
+       OCI_PROCESS_USER_UID,
+       OCI_PROCESS_USER_GID,
+       OCI_PROCESS_USER_UMASK,
+       OCI_PROCESS_USER_ADDITIONALGIDS,
+       __OCI_PROCESS_USER_MAX,
+};
+
+static const struct blobmsg_policy oci_process_user_policy[] = {
+       [OCI_PROCESS_USER_UID] = { "uid", BLOBMSG_TYPE_INT32 },
+       [OCI_PROCESS_USER_GID] = { "gid", BLOBMSG_TYPE_INT32 },
+       [OCI_PROCESS_USER_UMASK] = { "umask", BLOBMSG_TYPE_INT32 },
+       [OCI_PROCESS_USER_ADDITIONALGIDS] = { "additionalGids", BLOBMSG_TYPE_ARRAY },
+};
+
+static int parseOCIprocessuser(struct blob_attr *msg) {
+       struct blob_attr *tb[__OCI_PROCESS_USER_MAX];
+       struct blob_attr *cur;
+       int rem;
+       int has_gid = 0;
+
+       blobmsg_parse(oci_process_user_policy, __OCI_PROCESS_USER_MAX, tb, blobmsg_data(msg), blobmsg_len(msg));
+
+       if (tb[OCI_PROCESS_USER_UID])
+               opts.pw_uid = blobmsg_get_u32(tb[OCI_PROCESS_USER_UID]);
+
+       if (tb[OCI_PROCESS_USER_GID]) {
+               opts.pw_gid = blobmsg_get_u32(tb[OCI_PROCESS_USER_GID]);
+               opts.gr_gid = blobmsg_get_u32(tb[OCI_PROCESS_USER_GID]);
+               has_gid = 1;
+       }
+
+       if (tb[OCI_PROCESS_USER_ADDITIONALGIDS]) {
+               size_t gidcnt = 0;
+
+               blobmsg_for_each_attr(cur, tb[OCI_PROCESS_USER_ADDITIONALGIDS], rem) {
+                       ++gidcnt;
+                       if (has_gid && (blobmsg_get_u32(cur) == opts.gr_gid))
+                               continue;
+               }
+
+               if (gidcnt) {
+                       opts.additional_gids = calloc(gidcnt + has_gid, sizeof(gid_t));
+                       gidcnt = 0;
+
+                       /* always add primary GID to set of GIDs if set */
+                       if (has_gid)
+                               opts.additional_gids[gidcnt++] = opts.gr_gid;
+
+                       blobmsg_for_each_attr(cur, tb[OCI_PROCESS_USER_ADDITIONALGIDS], rem) {
+                               if (has_gid && (blobmsg_get_u32(cur) == opts.gr_gid))
+                                       continue;
+                               opts.additional_gids[gidcnt++] = blobmsg_get_u32(cur);
+                       }
+                       opts.num_additional_gids = gidcnt;
+               }
+               DEBUG("read %zu additional groups\n", gidcnt);
+       }
+
+       if (tb[OCI_PROCESS_USER_UMASK]) {
+               opts.umask = blobmsg_get_u32(tb[OCI_PROCESS_USER_UMASK]);
+               opts.set_umask = true;
+       }
+
+       return 0;
+}
+
+enum {
+       OCI_PROCESS_RLIMIT_TYPE,
+       OCI_PROCESS_RLIMIT_SOFT,
+       OCI_PROCESS_RLIMIT_HARD,
+       __OCI_PROCESS_RLIMIT_MAX,
+};
+
+static const struct blobmsg_policy oci_process_rlimit_policy[] = {
+       [OCI_PROCESS_RLIMIT_TYPE] = { "type", BLOBMSG_TYPE_STRING },
+       [OCI_PROCESS_RLIMIT_SOFT] = { "soft", BLOBMSG_CAST_INT64 },
+       [OCI_PROCESS_RLIMIT_HARD] = { "hard", BLOBMSG_CAST_INT64 },
+};
+
+/* from manpage GETRLIMIT(2) */
+static const char* const rlimit_names[RLIM_NLIMITS] = {
+       [RLIMIT_AS] = "AS",
+       [RLIMIT_CORE] = "CORE",
+       [RLIMIT_CPU] = "CPU",
+       [RLIMIT_DATA] = "DATA",
+       [RLIMIT_FSIZE] = "FSIZE",
+       [RLIMIT_LOCKS] = "LOCKS",
+       [RLIMIT_MEMLOCK] = "MEMLOCK",
+       [RLIMIT_MSGQUEUE] = "MSGQUEUE",
+       [RLIMIT_NICE] = "NICE",
+       [RLIMIT_NOFILE] = "NOFILE",
+       [RLIMIT_NPROC] = "NPROC",
+       [RLIMIT_RSS] = "RSS",
+       [RLIMIT_RTPRIO] = "RTPRIO",
+       [RLIMIT_RTTIME] = "RTTIME",
+       [RLIMIT_SIGPENDING] = "SIGPENDING",
+       [RLIMIT_STACK] = "STACK",
+};
+
+static int resolve_rlimit(char *type) {
+       unsigned int rltype;
+
+       for (rltype = 0; rltype < RLIM_NLIMITS; ++rltype)
+               if (rlimit_names[rltype] &&
+                   !strncmp("RLIMIT_", type, 7) &&
+                   !strcmp(rlimit_names[rltype], type + 7))
+                       return rltype;
+
+       return -1;
+}
+
+
+static int parseOCIrlimit(struct blob_attr *msg)
+{
+       struct blob_attr *tb[__OCI_PROCESS_RLIMIT_MAX];
+       int limtype = -1;
+       struct rlimit *curlim;
+
+       blobmsg_parse(oci_process_rlimit_policy, __OCI_PROCESS_RLIMIT_MAX, tb, blobmsg_data(msg), blobmsg_len(msg));
+
+       if (!tb[OCI_PROCESS_RLIMIT_TYPE] ||
+           !tb[OCI_PROCESS_RLIMIT_SOFT] ||
+           !tb[OCI_PROCESS_RLIMIT_HARD])
+               return ENODATA;
+
+       limtype = resolve_rlimit(blobmsg_get_string(tb[OCI_PROCESS_RLIMIT_TYPE]));
+
+       if (limtype < 0)
+               return EINVAL;
+
+       if (opts.rlimits[limtype])
+               return ENOTUNIQ;
+
+       curlim = malloc(sizeof(struct rlimit));
+       curlim->rlim_cur = blobmsg_cast_u64(tb[OCI_PROCESS_RLIMIT_SOFT]);
+       curlim->rlim_max = blobmsg_cast_u64(tb[OCI_PROCESS_RLIMIT_HARD]);
+
+       opts.rlimits[limtype] = curlim;
+
+       return 0;
+};
+
+enum {
+       OCI_PROCESS_ARGS,
+       OCI_PROCESS_CAPABILITIES,
+       OCI_PROCESS_CWD,
+       OCI_PROCESS_ENV,
+       OCI_PROCESS_OOMSCOREADJ,
+       OCI_PROCESS_NONEWPRIVILEGES,
+       OCI_PROCESS_RLIMITS,
+       OCI_PROCESS_TERMINAL,
+       OCI_PROCESS_USER,
+       __OCI_PROCESS_MAX,
+};
+
+static const struct blobmsg_policy oci_process_policy[] = {
+       [OCI_PROCESS_ARGS] = { "args", BLOBMSG_TYPE_ARRAY },
+       [OCI_PROCESS_CAPABILITIES] = { "capabilities", BLOBMSG_TYPE_TABLE },
+       [OCI_PROCESS_CWD] = { "cwd", BLOBMSG_TYPE_STRING },
+       [OCI_PROCESS_ENV] = { "env", BLOBMSG_TYPE_ARRAY },
+       [OCI_PROCESS_OOMSCOREADJ] = { "oomScoreAdj", BLOBMSG_TYPE_INT32 },
+       [OCI_PROCESS_NONEWPRIVILEGES] = { "noNewPrivileges", BLOBMSG_TYPE_BOOL },
+       [OCI_PROCESS_RLIMITS] = { "rlimits", BLOBMSG_TYPE_ARRAY },
+       [OCI_PROCESS_TERMINAL] = { "terminal", BLOBMSG_TYPE_BOOL },
+       [OCI_PROCESS_USER] = { "user", BLOBMSG_TYPE_TABLE },
+};
+
+
+static int parseOCIprocess(struct blob_attr *msg)
+{
+       struct blob_attr *tb[__OCI_PROCESS_MAX], *cur;
+       int rem, res;
+
+       blobmsg_parse(oci_process_policy, __OCI_PROCESS_MAX, tb, blobmsg_data(msg), blobmsg_len(msg));
+
+       if (!tb[OCI_PROCESS_ARGS])
+               return ENOENT;
+
+       res = parseOCIenvarray(tb[OCI_PROCESS_ARGS], &opts.jail_argv);
+       if (res)
+               return res;
+
+       if (tb[OCI_PROCESS_TERMINAL])
+               opts.console = blobmsg_get_bool(tb[OCI_PROCESS_TERMINAL]);
+
+       if (tb[OCI_PROCESS_NONEWPRIVILEGES])
+               opts.no_new_privs = blobmsg_get_bool(tb[OCI_PROCESS_NONEWPRIVILEGES]);
+
+       if (tb[OCI_PROCESS_CWD])
+               opts.cwd = strdup(blobmsg_get_string(tb[OCI_PROCESS_CWD]));
+
+       if (tb[OCI_PROCESS_ENV]) {
+               res = parseOCIenvarray(tb[OCI_PROCESS_ENV], &opts.envp);
+               if (res)
+                       return res;
+       }
+
+       if (tb[OCI_PROCESS_USER] && (res = parseOCIprocessuser(tb[OCI_PROCESS_USER])))
+               return res;
+
+       if (tb[OCI_PROCESS_CAPABILITIES] &&
+           (res = parseOCIcapabilities(&opts.capset, tb[OCI_PROCESS_CAPABILITIES])))
+               return res;
+
+       if (tb[OCI_PROCESS_RLIMITS]) {
+               blobmsg_for_each_attr(cur, tb[OCI_PROCESS_RLIMITS], rem) {
+                       res = parseOCIrlimit(cur);
+                       if (res)
+                               return res;
+               }
+       }
+
+       if (tb[OCI_PROCESS_OOMSCOREADJ]) {
+               opts.oom_score_adj = blobmsg_get_u32(tb[OCI_PROCESS_OOMSCOREADJ]);
+               opts.set_oom_score_adj = true;
+       }
+
+       return 0;
+}
+
+enum {
+       OCI_LINUX_NAMESPACE_TYPE,
+       OCI_LINUX_NAMESPACE_PATH,
+       __OCI_LINUX_NAMESPACE_MAX,
+};
+
+static const struct blobmsg_policy oci_linux_namespace_policy[] = {
+       [OCI_LINUX_NAMESPACE_TYPE] = { "type", BLOBMSG_TYPE_STRING },
+       [OCI_LINUX_NAMESPACE_PATH] = { "path", BLOBMSG_TYPE_STRING },
+};
+
+static int resolve_nstype(char *type) {
+       if (!strcmp("pid", type))
+               return CLONE_NEWPID;
+       else if (!strcmp("network", type))
+               return CLONE_NEWNET;
+       else if (!strcmp("mount", type))
+               return CLONE_NEWNS;
+       else if (!strcmp("ipc", type))
+               return CLONE_NEWIPC;
+       else if (!strcmp("uts", type))
+               return CLONE_NEWUTS;
+       else if (!strcmp("user", type))
+               return CLONE_NEWUSER;
+       else if (!strcmp("cgroup", type))
+               return CLONE_NEWCGROUP;
+#ifdef CLONE_NEWTIME
+       else if (!strcmp("time", type))
+               return CLONE_NEWTIME;
+#endif
+       else
+               return 0;
+}
+
+static int parseOCIlinuxns(struct blob_attr *msg)
+{
+       struct blob_attr *tb[__OCI_LINUX_NAMESPACE_MAX];
+       int nstype;
+       int *setns;
+       int fd;
+
+       blobmsg_parse(oci_linux_namespace_policy, __OCI_LINUX_NAMESPACE_MAX, tb, blobmsg_data(msg), blobmsg_len(msg));
+
+       if (!tb[OCI_LINUX_NAMESPACE_TYPE])
+               return EINVAL;
+
+       nstype = resolve_nstype(blobmsg_get_string(tb[OCI_LINUX_NAMESPACE_TYPE]));
+       if (!nstype)
+               return EINVAL;
+
+       if (opts.namespace & nstype)
+               return ENOTUNIQ;
+
+       setns = get_namespace_fd(nstype);
+
+       if (!setns)
+               return EFAULT;
+
+       if (*setns != -1)
+               return ENOTUNIQ;
+
+       if (tb[OCI_LINUX_NAMESPACE_PATH]) {
+               DEBUG("opening existing %s namespace from path %s\n",
+                       blobmsg_get_string(tb[OCI_LINUX_NAMESPACE_TYPE]),
+                       blobmsg_get_string(tb[OCI_LINUX_NAMESPACE_PATH]));
+
+               fd = open(blobmsg_get_string(tb[OCI_LINUX_NAMESPACE_PATH]), O_RDONLY);
+               if (fd == -1)
+                       return errno?:ESTALE;
+
+               if (ioctl(fd, NS_GET_NSTYPE) != nstype)
+                       return EINVAL;
+
+               DEBUG("opened existing %s namespace got filehandler %u\n",
+                       blobmsg_get_string(tb[OCI_LINUX_NAMESPACE_TYPE]),
+                       fd);
+
+               *setns = fd;
+       } else {
+               opts.namespace |= nstype;
+       }
+
+       return 0;
+}
+
+static void get_jail_root_user(bool is_gidmap, uint32_t container_id, uint32_t host_id, uint32_t size)
+{
+       if (container_id == 0 && size >= 1)
+               if (!is_gidmap)
+                       opts.root_map_uid = host_id;
+}
+
+enum {
+       OCI_LINUX_UIDGIDMAP_CONTAINERID,
+       OCI_LINUX_UIDGIDMAP_HOSTID,
+       OCI_LINUX_UIDGIDMAP_SIZE,
+       __OCI_LINUX_UIDGIDMAP_MAX,
+};
+
+static const struct blobmsg_policy oci_linux_uidgidmap_policy[] = {
+       [OCI_LINUX_UIDGIDMAP_CONTAINERID] = { "containerID", BLOBMSG_TYPE_INT32 },
+       [OCI_LINUX_UIDGIDMAP_HOSTID] = { "hostID", BLOBMSG_TYPE_INT32 },
+       [OCI_LINUX_UIDGIDMAP_SIZE] = { "size", BLOBMSG_TYPE_INT32 },
+};
+
+static int parseOCIuidgidmappings(struct blob_attr *msg, bool is_gidmap)
+{
+       struct blob_attr *tb[__OCI_LINUX_UIDGIDMAP_MAX];
+       struct blob_attr *cur;
+       int rem;
+       char *map;
+       size_t len, pos, totallen = 0;
+
+       blobmsg_for_each_attr(cur, msg, rem) {
+               blobmsg_parse(oci_linux_uidgidmap_policy, __OCI_LINUX_UIDGIDMAP_MAX, tb, blobmsg_data(cur), blobmsg_len(cur));
+
+               if (!tb[OCI_LINUX_UIDGIDMAP_CONTAINERID] ||
+                   !tb[OCI_LINUX_UIDGIDMAP_HOSTID] ||
+                   !tb[OCI_LINUX_UIDGIDMAP_SIZE])
+                       return EINVAL;
+
+               /* count length */
+               totallen += snprintf(NULL, 0, "%d %d %d\n",
+                        blobmsg_get_u32(tb[OCI_LINUX_UIDGIDMAP_CONTAINERID]),
+                        blobmsg_get_u32(tb[OCI_LINUX_UIDGIDMAP_HOSTID]),
+                        blobmsg_get_u32(tb[OCI_LINUX_UIDGIDMAP_SIZE]));
+       }
+
+       /* allocate combined mapping string */
+       map = malloc(totallen + 1);
+       if (!map)
+               return ENOMEM;
+
+       pos = 0;
+       blobmsg_for_each_attr(cur, msg, rem) {
+               blobmsg_parse(oci_linux_uidgidmap_policy, __OCI_LINUX_UIDGIDMAP_MAX, tb, blobmsg_data(cur), blobmsg_len(cur));
+
+               get_jail_root_user(is_gidmap, blobmsg_get_u32(tb[OCI_LINUX_UIDGIDMAP_CONTAINERID]),
+                        blobmsg_get_u32(tb[OCI_LINUX_UIDGIDMAP_HOSTID]),
+                        blobmsg_get_u32(tb[OCI_LINUX_UIDGIDMAP_SIZE]));
+
+               /* write mapping line into pre-allocated string */
+               len = snprintf(&map[pos], totallen + 1, "%d %d %d\n",
+                        blobmsg_get_u32(tb[OCI_LINUX_UIDGIDMAP_CONTAINERID]),
+                        blobmsg_get_u32(tb[OCI_LINUX_UIDGIDMAP_HOSTID]),
+                        blobmsg_get_u32(tb[OCI_LINUX_UIDGIDMAP_SIZE]));
+               pos += len;
+               totallen -= len;
+       }
+
+       assert(totallen == 0);
+
+       if (is_gidmap)
+               opts.gidmap = map;
+       else
+               opts.uidmap = map;
+
+       return 0;
+}
+
+enum {
+       OCI_DEVICES_TYPE,
+       OCI_DEVICES_PATH,
+       OCI_DEVICES_MAJOR,
+       OCI_DEVICES_MINOR,
+       OCI_DEVICES_FILEMODE,
+       OCI_DEVICES_UID,
+       OCI_DEVICES_GID,
+       __OCI_DEVICES_MAX,
+};
+
+static const struct blobmsg_policy oci_devices_policy[] = {
+       [OCI_DEVICES_TYPE] = { "type", BLOBMSG_TYPE_STRING },
+       [OCI_DEVICES_PATH] = { "path", BLOBMSG_TYPE_STRING },
+       [OCI_DEVICES_MAJOR] = { "major", BLOBMSG_TYPE_INT32 },
+       [OCI_DEVICES_MINOR] = { "minor", BLOBMSG_TYPE_INT32 },
+       [OCI_DEVICES_FILEMODE] = { "fileMode", BLOBMSG_TYPE_INT32 },
+       [OCI_DEVICES_UID] = { "uid", BLOBMSG_TYPE_INT32 },
+       [OCI_DEVICES_GID] = { "uid", BLOBMSG_TYPE_INT32 },
+};
+
+static mode_t resolve_devtype(char *tstr)
+{
+       if (!strcmp("c", tstr) ||
+           !strcmp("u", tstr))
+               return S_IFCHR;
+       else if (!strcmp("b", tstr))
+               return S_IFBLK;
+       else if (!strcmp("p", tstr))
+               return S_IFIFO;
+       else
+               return 0;
+}
+
+static int parseOCIdevices(struct blob_attr *msg)
+{
+       struct blob_attr *tb[__OCI_DEVICES_MAX];
+       struct blob_attr *cur;
+       int rem;
+       size_t cnt = 0;
+       struct mknod_args *tmp;
+
+       blobmsg_for_each_attr(cur, msg, rem)
+               ++cnt;
+
+       opts.devices = calloc(cnt + 1, sizeof(struct mknod_args *));
+
+       cnt = 0;
+       blobmsg_for_each_attr(cur, msg, rem) {
+               blobmsg_parse(oci_devices_policy, __OCI_DEVICES_MAX, tb, blobmsg_data(cur), blobmsg_len(cur));
+               if (!tb[OCI_DEVICES_TYPE] ||
+                   !tb[OCI_DEVICES_PATH])
+                       return ENODATA;
+
+               tmp = calloc(1, sizeof(struct mknod_args));
+               if (!tmp)
+                       return ENOMEM;
+
+               tmp->mode = resolve_devtype(blobmsg_get_string(tb[OCI_DEVICES_TYPE]));
+               if (!tmp->mode)
+                       return EINVAL;
+
+               if (tmp->mode != S_IFIFO) {
+                       if (!tb[OCI_DEVICES_MAJOR] || !tb[OCI_DEVICES_MINOR])
+                               return ENODATA;
+
+                       tmp->dev = makedev(blobmsg_get_u32(tb[OCI_DEVICES_MAJOR]),
+                                          blobmsg_get_u32(tb[OCI_DEVICES_MINOR]));
+               }
+
+               if (tb[OCI_DEVICES_FILEMODE]) {
+                       if (~(S_IRWXU|S_IRWXG|S_IRWXO) & blobmsg_get_u32(tb[OCI_DEVICES_FILEMODE]))
+                               return EINVAL;
+
+                       tmp->mode |= blobmsg_get_u32(tb[OCI_DEVICES_FILEMODE]);
+               } else {
+                       tmp->mode |= (S_IRUSR|S_IWUSR); /* 0600 */
+               }
+
+               tmp->path = strdup(blobmsg_get_string(tb[OCI_DEVICES_PATH]));
+
+               if (tb[OCI_DEVICES_UID])
+                       tmp->uid = blobmsg_get_u32(tb[OCI_DEVICES_UID]);
+               else
+                       tmp->uid = -1;
+
+               if (tb[OCI_DEVICES_GID])
+                       tmp->gid = blobmsg_get_u32(tb[OCI_DEVICES_GID]);
+               else
+                       tmp->gid = -1;
+
+               DEBUG("read device %s (%s)\n", blobmsg_get_string(tb[OCI_DEVICES_PATH]), blobmsg_get_string(tb[OCI_DEVICES_TYPE]));
+               opts.devices[cnt++] = tmp;
+       }
+
+       opts.devices[cnt] = NULL;
+
+       return 0;
+}
+
+static int parseOCIsysctl(struct blob_attr *msg)
+{
+       struct blob_attr *cur;
+       int rem;
+       char *tmp, *tc;
+       size_t cnt = 0;
+
+       blobmsg_for_each_attr(cur, msg, rem) {
+               if (!blobmsg_name(cur) || !blobmsg_get_string(cur))
+                       return EINVAL;
+
+               ++cnt;
+       }
+
+       if (!cnt)
+               return 0;
+
+       opts.sysctl = calloc(cnt + 1, sizeof(struct sysctl_val *));
+       if (!opts.sysctl)
+               return ENOMEM;
+
+       cnt = 0;
+       blobmsg_for_each_attr(cur, msg, rem) {
+               opts.sysctl[cnt] = malloc(sizeof(struct sysctl_val));
+               if (!opts.sysctl[cnt])
+                       return ENOMEM;
+
+               /* replace '.' with '/' in entry name */
+               tc = tmp = strdup(blobmsg_name(cur));
+               while ((tc = strchr(tc, '.')))
+                       *tc = '/';
+
+               opts.sysctl[cnt]->value = strdup(blobmsg_get_string(cur));
+               opts.sysctl[cnt]->entry = tmp;
+
+               ++cnt;
+       }
+
+       opts.sysctl[cnt] = NULL;
+
+       return 0;
+}
+
+
+enum {
+       OCI_LINUX_CGROUPSPATH,
+       OCI_LINUX_RESOURCES,
+       OCI_LINUX_SECCOMP,
+       OCI_LINUX_SYSCTL,
+       OCI_LINUX_NAMESPACES,
+       OCI_LINUX_DEVICES,
+       OCI_LINUX_UIDMAPPINGS,
+       OCI_LINUX_GIDMAPPINGS,
+       OCI_LINUX_MASKEDPATHS,
+       OCI_LINUX_READONLYPATHS,
+       OCI_LINUX_ROOTFSPROPAGATION,
+       __OCI_LINUX_MAX,
+};
+
+static const struct blobmsg_policy oci_linux_policy[] = {
+       [OCI_LINUX_CGROUPSPATH] = { "cgroupsPath", BLOBMSG_TYPE_STRING },
+       [OCI_LINUX_RESOURCES] = { "resources", BLOBMSG_TYPE_TABLE },
+       [OCI_LINUX_SECCOMP] = { "seccomp", BLOBMSG_TYPE_TABLE },
+       [OCI_LINUX_SYSCTL] = { "sysctl", BLOBMSG_TYPE_TABLE },
+       [OCI_LINUX_NAMESPACES] = { "namespaces", BLOBMSG_TYPE_ARRAY },
+       [OCI_LINUX_DEVICES] = { "devices", BLOBMSG_TYPE_ARRAY },
+       [OCI_LINUX_UIDMAPPINGS] = { "uidMappings", BLOBMSG_TYPE_ARRAY },
+       [OCI_LINUX_GIDMAPPINGS] = { "gidMappings", BLOBMSG_TYPE_ARRAY },
+       [OCI_LINUX_MASKEDPATHS] = { "maskedPaths", BLOBMSG_TYPE_ARRAY },
+       [OCI_LINUX_READONLYPATHS] = { "readonlyPaths", BLOBMSG_TYPE_ARRAY },
+       [OCI_LINUX_ROOTFSPROPAGATION] = { "rootfsPropagation", BLOBMSG_TYPE_STRING },
+};
+
+static int parseOCIlinux(struct blob_attr *msg)
+{
+       struct blob_attr *tb[__OCI_LINUX_MAX];
+       struct blob_attr *cur;
+       int rem;
+       int res = 0;
+       char *cgpath;
+       char cgfullpath[256] = "/sys/fs/cgroup";
+
+       blobmsg_parse(oci_linux_policy, __OCI_LINUX_MAX, tb, blobmsg_data(msg), blobmsg_len(msg));
+
+       if (tb[OCI_LINUX_NAMESPACES]) {
+               blobmsg_for_each_attr(cur, tb[OCI_LINUX_NAMESPACES], rem) {
+                       res = parseOCIlinuxns(cur);
+                       if (res)
+                               return res;
+               }
+       }
+
+       if (tb[OCI_LINUX_UIDMAPPINGS]) {
+               res = parseOCIuidgidmappings(tb[OCI_LINUX_GIDMAPPINGS], 0);
+               if (res)
+                       return res;
+       }
+
+       if (tb[OCI_LINUX_GIDMAPPINGS]) {
+               res = parseOCIuidgidmappings(tb[OCI_LINUX_GIDMAPPINGS], 1);
+               if (res)
+                       return res;
+       }
+
+       if (tb[OCI_LINUX_READONLYPATHS]) {
+               blobmsg_for_each_attr(cur, tb[OCI_LINUX_READONLYPATHS], rem) {
+                       res = add_mount(NULL, blobmsg_get_string(cur), NULL, MS_BIND | MS_REC | MS_RDONLY, 0, NULL, 0);
+                       if (res)
+                               return res;
+               }
+       }
+
+       if (tb[OCI_LINUX_MASKEDPATHS]) {
+               blobmsg_for_each_attr(cur, tb[OCI_LINUX_MASKEDPATHS], rem) {
+                       res = add_mount((void *)(-1), blobmsg_get_string(cur), NULL, 0, 0, NULL, 0);
+                       if (res)
+                               return res;
+               }
+       }
+
+       if (tb[OCI_LINUX_SYSCTL]) {
+               res = parseOCIsysctl(tb[OCI_LINUX_SYSCTL]);
+               if (res)
+                       return res;
+       }
+
+       if (tb[OCI_LINUX_SECCOMP]) {
+               opts.ociseccomp = parseOCIlinuxseccomp(tb[OCI_LINUX_SECCOMP]);
+               if (!opts.ociseccomp)
+                       return EINVAL;
+       }
+
+       if (tb[OCI_LINUX_DEVICES]) {
+               res = parseOCIdevices(tb[OCI_LINUX_DEVICES]);
+               if (res)
+                       return res;
        }
 
-       if (readonly && mount(NULL, new, NULL, MS_BIND | MS_REMOUNT | MS_RDONLY, NULL)) {
-               ERROR("failed to remount ro %s: %s\n", new, strerror(errno));
-               return -1;
+       if (tb[OCI_LINUX_CGROUPSPATH]) {
+               cgpath = blobmsg_get_string(tb[OCI_LINUX_CGROUPSPATH]);
+               if (cgpath[0] == '/') {
+                       if (strlen(cgpath) >= (sizeof(cgfullpath) - strlen(cgfullpath)))
+                               return E2BIG;
+
+                       strcat(cgfullpath, cgpath);
+               } else {
+                       strcat(cgfullpath, "/containers/");
+                       strcat(cgfullpath, opts.name); /* should be container name rather than jail name */
+                       strcat(cgfullpath, "/");
+                       if (strlen(cgpath) >= (sizeof(cgfullpath) - strlen(cgfullpath)))
+                               return E2BIG;
+
+                       strcat(cgfullpath, cgpath);
+               }
+       } else {
+               strcat(cgfullpath, "/containers/");
+               strcat(cgfullpath, opts.name); /* should be container name rather than jail name */
+               strcat(cgfullpath, "/");
+               strcat(cgfullpath, opts.name); /* should be container instance name rather than jail name */
        }
 
-       DEBUG("mount -B %s %s\n", path, new);
+       cgroups_init(cgfullpath);
+
+       if (tb[OCI_LINUX_RESOURCES]) {
+               res = parseOCIlinuxcgroups(tb[OCI_LINUX_RESOURCES]);
+               if (res)
+                       return res;
+       }
 
        return 0;
 }
 
-static int build_jail_fs(void)
+enum {
+       OCI_VERSION,
+       OCI_HOSTNAME,
+       OCI_PROCESS,
+       OCI_ROOT,
+       OCI_MOUNTS,
+       OCI_HOOKS,
+       OCI_LINUX,
+       OCI_ANNOTATIONS,
+       __OCI_MAX,
+};
+
+static const struct blobmsg_policy oci_policy[] = {
+       [OCI_VERSION] = { "ociVersion", BLOBMSG_TYPE_STRING },
+       [OCI_HOSTNAME] = { "hostname", BLOBMSG_TYPE_STRING },
+       [OCI_PROCESS] = { "process", BLOBMSG_TYPE_TABLE },
+       [OCI_ROOT] = { "root", BLOBMSG_TYPE_TABLE },
+       [OCI_MOUNTS] = { "mounts", BLOBMSG_TYPE_ARRAY },
+       [OCI_HOOKS] = { "hooks", BLOBMSG_TYPE_TABLE },
+       [OCI_LINUX] = { "linux", BLOBMSG_TYPE_TABLE },
+       [OCI_ANNOTATIONS] = { "annotations", BLOBMSG_TYPE_TABLE },
+};
+
+static int parseOCI(const char *jsonfile)
 {
-       char jail_root[] = "/tmp/ujail-XXXXXX";
-       if (mkdtemp(jail_root) == NULL) {
-               ERROR("mkdtemp(jail_root) failed: %s\n", strerror(errno));
-               return -1;
-       }
+       struct blob_attr *tb[__OCI_MAX];
+       struct blob_attr *cur;
+       int rem;
+       int res;
 
-       if (mount("tmpfs", jail_root, "tmpfs", MS_NOATIME, "mode=0755")) {
-               ERROR("tmpfs mount failed %s\n", strerror(errno));
-               return -1;
+       blob_buf_init(&ocibuf, 0);
+
+       if (!blobmsg_add_json_from_file(&ocibuf, jsonfile)) {
+               res=ENOENT;
+               goto errout;
        }
 
-       if (chdir(jail_root)) {
-               ERROR("failed to chdir() in the jail root\n");
-               return -1;
+       blobmsg_parse(oci_policy, __OCI_MAX, tb, blob_data(ocibuf.head), blob_len(ocibuf.head));
+
+       if (!tb[OCI_VERSION]) {
+               res=ENOMSG;
+               goto errout;
        }
 
-       if (mount_all(jail_root)) {
-               ERROR("mount_all() failed\n");
-               return -1;
+       if (strncmp("1.0", blobmsg_get_string(tb[OCI_VERSION]), 3)) {
+               ERROR("unsupported ociVersion %s\n", blobmsg_get_string(tb[OCI_VERSION]));
+               res=ENOTSUP;
+               goto errout;
        }
 
-       char dirbuf[sizeof(jail_root) + 4];
-       snprintf(dirbuf, sizeof(dirbuf), "%s/old", jail_root);
-       mkdir(dirbuf, 0755);
+       if (tb[OCI_HOSTNAME])
+               opts.hostname = strdup(blobmsg_get_string(tb[OCI_HOSTNAME]));
 
-       if (pivot_root(jail_root, dirbuf) == -1) {
-               ERROR("pivot_root failed: %s\n", strerror(errno));
-               return -1;
-       }
-       if (chdir("/")) {
-               ERROR("chdir(/) failed: %s\n", strerror(errno));
-               return -1;
+       if (!tb[OCI_PROCESS]) {
+               res=ENODATA;
+               goto errout;
        }
 
-       snprintf(dirbuf, sizeof(dirbuf), "/old%s", jail_root);
-       rmdir(dirbuf);
-       umount2("/old", MNT_DETACH);
-       rmdir("/old");
+       if ((res = parseOCIprocess(tb[OCI_PROCESS])))
+               goto errout;
 
-       if (opts.procfs) {
-               mkdir("/proc", 0755);
-               mount("proc", "/proc", "proc", MS_NOATIME | MS_NODEV | MS_NOEXEC | MS_NOSUID, 0);
+       if (!tb[OCI_ROOT]) {
+               res=ENODATA;
+               goto errout;
        }
-       if (opts.sysfs) {
-               mkdir("/sys", 0755);
-               mount("sysfs", "/sys", "sysfs", MS_NOATIME | MS_NODEV | MS_NOEXEC | MS_NOSUID, 0);
+       if ((res = parseOCIroot(jsonfile, tb[OCI_ROOT])))
+               goto errout;
+
+       if (!tb[OCI_MOUNTS]) {
+               res=ENODATA;
+               goto errout;
        }
-       if (opts.ronly)
-               mount(NULL, "/", NULL, MS_RDONLY | MS_REMOUNT, 0);
 
-       return 0;
+       blobmsg_for_each_attr(cur, tb[OCI_MOUNTS], rem)
+               if ((res = parseOCImount(cur)))
+                       goto errout;
+
+       if (tb[OCI_LINUX] && (res = parseOCIlinux(tb[OCI_LINUX])))
+               goto errout;
+
+       if (tb[OCI_HOOKS] && (res = parseOCIhooks(tb[OCI_HOOKS])))
+               goto errout;
+
+       if (tb[OCI_ANNOTATIONS])
+               opts.annotations = blob_memdup(tb[OCI_ANNOTATIONS]);
+
+errout:
+       blob_buf_free(&ocibuf);
+
+       return res;
 }
 
-#define MAX_ENVP       8
-static char** build_envp(const char *seccomp)
+static int set_oom_score_adj(void)
 {
-       static char *envp[MAX_ENVP];
-       static char preload_var[PATH_MAX];
-       static char seccomp_var[PATH_MAX];
-       static char debug_var[] = "LD_DEBUG=all";
-       const char *preload_lib = find_lib("libpreload-seccomp.so");
-       int count = 0;
+       int f;
+       char fname[32];
 
-       if (seccomp && !preload_lib) {
-               ERROR("failed to add preload-lib to env\n");
-               return NULL;
-       }
-       if (seccomp) {
-               snprintf(seccomp_var, sizeof(seccomp_var), "SECCOMP_FILE=%s", seccomp);
-               envp[count++] = seccomp_var;
-               snprintf(preload_var, sizeof(preload_var), "LD_PRELOAD=%s", preload_lib);
-               envp[count++] = preload_var;
-       }
-       if (debug > 1)
-               envp[count++] = debug_var;
+       if (!opts.set_oom_score_adj)
+               return 0;
 
-       return envp;
+       snprintf(fname, sizeof(fname), "/proc/%u/oom_score_adj", jail_process.pid);
+       f = open(fname, O_WRONLY | O_TRUNC);
+       if (f == -1)
+               return errno;
+
+       dprintf(f, "%d", opts.oom_score_adj);
+       close(f);
+
+       return 0;
 }
 
-static void usage(void)
+
+enum {
+       OCI_STATE_CREATING,
+       OCI_STATE_CREATED,
+       OCI_STATE_RUNNING,
+       OCI_STATE_STOPPED,
+};
+
+static int jail_oci_state = OCI_STATE_CREATED;
+static void pipe_send_start_container(struct uloop_timeout *t);
+static struct uloop_timeout start_container_timeout = {
+       .cb = pipe_send_start_container,
+};
+
+static int handle_start(struct ubus_context *ctx, struct ubus_object *obj,
+                       struct ubus_request_data *req, const char *method,
+                       struct blob_attr *msg)
 {
-       fprintf(stderr, "ujail <options> -- <binary> <params ...>\n");
-       fprintf(stderr, "  -d <num>\tshow debug log (increase num to increase verbosity)\n");
-       fprintf(stderr, "  -S <file>\tseccomp filter config\n");
-       fprintf(stderr, "  -C <file>\tcapabilities drop config\n");
-       fprintf(stderr, "  -c\t\tset PR_SET_NO_NEW_PRIVS\n");
-       fprintf(stderr, "  -n <name>\tthe name of the jail\n");
-       fprintf(stderr, "namespace jail options:\n");
-       fprintf(stderr, "  -h <hostname>\tchange the hostname of the jail\n");
-       fprintf(stderr, "  -r <file>\treadonly files that should be staged\n");
-       fprintf(stderr, "  -w <file>\twriteable files that should be staged\n");
-       fprintf(stderr, "  -p\t\tjail has /proc\n");
-       fprintf(stderr, "  -s\t\tjail has /sys\n");
-       fprintf(stderr, "  -l\t\tjail has /dev/log\n");
-       fprintf(stderr, "  -u\t\tjail has a ubus socket\n");
-       fprintf(stderr, "  -o\t\tremont jail root (/) read only\n");
-       fprintf(stderr, "\nWarning: by default root inside the jail is the same\n\
-and he has the same powers as root outside the jail,\n\
-thus he can escape the jail and/or break stuff.\n\
-Please use seccomp/capabilities (-S/-C) to restrict his powers\n\n\
-If you use none of the namespace jail options,\n\
-ujail will not use namespace/build a jail,\n\
-and will only drop capabilities/apply seccomp filter.\n\n");
+       if (jail_oci_state != OCI_STATE_CREATED)
+               return UBUS_STATUS_INVALID_ARGUMENT;
+
+       uloop_timeout_add(&start_container_timeout);
+
+       return UBUS_STATUS_OK;
 }
 
-static int exec_jail(void)
+static struct blob_buf bb;
+static int handle_state(struct ubus_context *ctx, struct ubus_object *obj,
+                       struct ubus_request_data *req, const char *method,
+                       struct blob_attr *msg)
 {
-       char **envp = build_envp(opts.seccomp);
-       if (!envp)
-               exit(EXIT_FAILURE);
+       char *statusstr;
 
-       if (opts.capabilities && drop_capabilities(opts.capabilities))
-               exit(EXIT_FAILURE);
-
-       if (opts.no_new_privs && prctl(PR_SET_NO_NEW_PRIVS, 1, 0, 0, 0)) {
-                ERROR("prctl(PR_SET_NO_NEW_PRIVS) failed: %s\n", strerror(errno));
-               exit(EXIT_FAILURE);
+       switch (jail_oci_state) {
+               case OCI_STATE_CREATING:
+                       statusstr = "creating";
+                       break;
+               case OCI_STATE_CREATED:
+                       statusstr = "created";
+                       break;
+               case OCI_STATE_RUNNING:
+                       statusstr = "running";
+                       break;
+               case OCI_STATE_STOPPED:
+                       statusstr = "stopped";
+                       break;
+               default:
+                       statusstr = "unknown";
        }
 
-       INFO("exec-ing %s\n", *opts.jail_argv);
-       execve(*opts.jail_argv, opts.jail_argv, envp);
-       /* we get there only if execve fails */
-       ERROR("failed to execve %s: %s\n", *opts.jail_argv, strerror(errno));
-       exit(EXIT_FAILURE);
+       blob_buf_init(&bb, 0);
+       blobmsg_add_string(&bb, "ociVersion", OCI_VERSION_STRING);
+       blobmsg_add_string(&bb, "id", opts.name);
+       blobmsg_add_string(&bb, "status", statusstr);
+       if (jail_oci_state == OCI_STATE_CREATED ||
+           jail_oci_state == OCI_STATE_RUNNING)
+               blobmsg_add_u32(&bb, "pid", jail_process.pid);
+
+       blobmsg_add_string(&bb, "bundle", opts.ocibundle);
+
+       if (opts.annotations)
+               blobmsg_add_blob(&bb, opts.annotations);
+
+       ubus_send_reply(ctx, req, bb.head);
+
+       return UBUS_STATUS_OK;
 }
 
-static int spawn_jail(void *_notused)
+enum {
+       CONTAINER_KILL_ATTR_SIGNAL,
+       __CONTAINER_KILL_ATTR_MAX,
+};
+
+static const struct blobmsg_policy container_kill_attrs[__CONTAINER_KILL_ATTR_MAX] = {
+       [CONTAINER_KILL_ATTR_SIGNAL] = { "signal", BLOBMSG_TYPE_INT32 },
+};
+
+static int
+container_handle_kill(struct ubus_context *ctx, struct ubus_object *obj,
+                   struct ubus_request_data *req, const char *method,
+                   struct blob_attr *msg)
 {
-       if (opts.hostname && sethostname(opts.hostname, strlen(opts.hostname))) {
-               ERROR("sethostname(%s) failed: %s\n", opts.hostname, strerror(errno));
-       }
+       struct blob_attr *tb[__CONTAINER_KILL_ATTR_MAX], *cur;
+       int sig = SIGTERM;
+
+       blobmsg_parse(container_kill_attrs, __CONTAINER_KILL_ATTR_MAX, tb, blobmsg_data(msg), blobmsg_data_len(msg));
+
+       cur = tb[CONTAINER_KILL_ATTR_SIGNAL];
+       if (cur)
+               sig = blobmsg_get_u32(cur);
+
+       if (jail_oci_state == OCI_STATE_CREATING)
+               return UBUS_STATUS_NOT_FOUND;
+
+       if (kill(jail_process.pid, sig) == 0)
+               return 0;
 
-       if (build_jail_fs()) {
-               ERROR("failed to build jail fs");
-               exit(EXIT_FAILURE);
+       switch (errno) {
+       case EINVAL: return UBUS_STATUS_INVALID_ARGUMENT;
+       case EPERM:  return UBUS_STATUS_PERMISSION_DENIED;
+       case ESRCH:  return UBUS_STATUS_NOT_FOUND;
        }
 
-       return exec_jail();
+       return UBUS_STATUS_UNKNOWN_ERROR;
 }
 
-static int jail_running = 1;
-static int jail_return_code = 0;
-
-static void jail_process_handler(struct uloop_process *c, int ret)
+static int
+jail_writepid(pid_t pid)
 {
-       if (WIFEXITED(ret)) {
-               jail_return_code = WEXITSTATUS(ret);
-               INFO("jail (%d) exited with exit: %d\n", c->pid, jail_return_code);
-       } else {
-               jail_return_code = WTERMSIG(ret);
-               INFO("jail (%d) exited with signal: %d\n", c->pid, jail_return_code);
+       FILE *_pidfile;
+
+       if (!opts.pidfile)
+               return 0;
+
+       _pidfile = fopen(opts.pidfile, "w");
+       if (_pidfile == NULL)
+               return errno;
+
+       if (fprintf(_pidfile, "%d\n", pid) < 0) {
+               fclose(_pidfile);
+               return errno;
        }
-       jail_running = 0;
-       uloop_end();
+
+       if (fclose(_pidfile))
+               return errno;
+
+       return 0;
 }
 
-static struct uloop_process jail_process = {
-       .cb = jail_process_handler,
+static struct ubus_method container_methods[] = {
+       UBUS_METHOD_NOARG("start", handle_start),
+       UBUS_METHOD_NOARG("state", handle_state),
+       UBUS_METHOD("kill", container_handle_kill, container_kill_attrs),
+};
+
+static struct ubus_object_type container_object_type =
+       UBUS_OBJECT_TYPE("container", container_methods);
+
+static struct ubus_object container_object = {
+       .type = &container_object_type,
+       .methods = container_methods,
+       .n_methods = ARRAY_SIZE(container_methods),
 };
 
+static void post_main(struct uloop_timeout *t);
+static struct uloop_timeout post_main_timeout = {
+       .cb = post_main,
+};
+static int netns_fd;
+static int pidns_fd;
+#ifdef CLONE_NEWTIME
+static int timens_fd;
+#endif
+static void post_create_runtime(void);
 int main(int argc, char **argv)
 {
        uid_t uid = getuid();
-       char log[] = "/dev/log";
-       char ubus[] = "/var/run/ubus.sock";
-       int ch;
+       const char log[] = "/dev/log";
+       const char ubus[] = "/var/run/ubus/ubus.sock";
+       int ch, ret;
 
        if (uid) {
-               ERROR("not root, aborting: %s\n", strerror(errno));
+               ERROR("not root, aborting: %m\n");
                return EXIT_FAILURE;
        }
 
        umask(022);
        mount_list_init();
        init_library_search();
+       cgroups_prepare();
+       exit_from_child = false;
 
        while ((ch = getopt(argc, argv, OPT_ARGS)) != -1) {
                switch (ch) {
@@ -305,24 +2462,32 @@ int main(int argc, char **argv)
                        debug = atoi(optarg);
                        break;
                case 'p':
-                       opts.namespace = 1;
+                       opts.namespace |= CLONE_NEWNS;
                        opts.procfs = 1;
                        break;
                case 'o':
-                       opts.namespace = 1;
+                       opts.namespace |= CLONE_NEWNS;
                        opts.ronly = 1;
                        break;
+               case 'f':
+                       opts.namespace |= CLONE_NEWUSER;
+                       break;
+               case 'F':
+                       opts.namespace |= CLONE_NEWCGROUP;
+                       break;
+               case 'R':
+                       opts.extroot = optarg;
+                       break;
                case 's':
-                       opts.namespace = 1;
+                       opts.namespace |= CLONE_NEWNS;
                        opts.sysfs = 1;
                        break;
                case 'S':
                        opts.seccomp = optarg;
-                       add_mount(optarg, 1, -1);
+                       add_mount_bind(optarg, 1, -1);
                        break;
                case 'C':
                        opts.capabilities = optarg;
-                       add_mount(optarg, 1, -1);
                        break;
                case 'c':
                        opts.no_new_privs = 1;
@@ -330,83 +2495,448 @@ int main(int argc, char **argv)
                case 'n':
                        opts.name = optarg;
                        break;
+               case 'N':
+                       opts.namespace |= CLONE_NEWNET;
+                       break;
                case 'h':
-                       opts.hostname = optarg;
+                       opts.namespace |= CLONE_NEWUTS;
+                       opts.hostname = strdup(optarg);
                        break;
                case 'r':
-                       opts.namespace = 1;
+                       opts.namespace |= CLONE_NEWNS;
                        add_path_and_deps(optarg, 1, 0, 0);
                        break;
                case 'w':
-                       opts.namespace = 1;
+                       opts.namespace |= CLONE_NEWNS;
                        add_path_and_deps(optarg, 0, 0, 0);
                        break;
                case 'u':
-                       opts.namespace = 1;
-                       add_mount(ubus, 0, -1);
+                       opts.namespace |= CLONE_NEWNS;
+                       add_mount_bind(ubus, 0, -1);
                        break;
                case 'l':
-                       opts.namespace = 1;
-                       add_mount(log, 0, -1);
+                       opts.namespace |= CLONE_NEWNS;
+                       add_mount_bind(log, 0, -1);
+                       break;
+               case 'U':
+                       opts.user = optarg;
+                       break;
+               case 'G':
+                       opts.group = optarg;
+                       break;
+               case 'O':
+                       opts.overlaydir = optarg;
                        break;
+               case 'T':
+                       opts.tmpoverlaysize = optarg;
+                       break;
+               case 'E':
+                       opts.require_jail = 1;
+                       break;
+               case 'y':
+                       opts.console = 1;
+                       break;
+               case 'J':
+                       opts.ocibundle = optarg;
+                       break;
+               case 'i':
+                       opts.immediately = true;
+                       break;
+               case 'P':
+                       opts.pidfile = optarg;
+                       break;
+               }
+       }
+
+       if (opts.namespace && !opts.ocibundle)
+               opts.namespace |= CLONE_NEWIPC | CLONE_NEWPID;
+
+       /* those are filehandlers, so -1 indicates unused */
+       opts.setns.pid = -1;
+       opts.setns.net = -1;
+       opts.setns.ns = -1;
+       opts.setns.ipc = -1;
+       opts.setns.uts = -1;
+       opts.setns.user = -1;
+       opts.setns.cgroup = -1;
+#ifdef CLONE_NEWTIME
+       opts.setns.time = -1;
+#endif
+
+       /*
+        * uid in parent user namespace representing root user in new
+        * user namespace, defaults to nobody unless specified in uidMappings
+        */
+       opts.root_map_uid = 65534;
+
+       if (opts.capabilities && parseOCIcapabilities_from_file(&opts.capset, opts.capabilities)) {
+               ERROR("failed to read capabilities from file %s\n", opts.capabilities);
+               ret=-1;
+               goto errout;
+       }
+
+       if (opts.ocibundle) {
+               char *jsonfile;
+               int ocires;
+
+               if (!opts.name) {
+                       ERROR("OCI bundle needs a named jail\n");
+                       ret=-1;
+                       goto errout;
+               }
+               asprintf(&jsonfile, "%s/config.json", opts.ocibundle);
+               ocires = parseOCI(jsonfile);
+               free(jsonfile);
+               if (ocires) {
+                       ERROR("parsing of OCI JSON spec has failed: %s (%d)\n", strerror(ocires), ocires);
+                       ret=ocires;
+                       goto errout;
                }
        }
 
+       if (opts.namespace & CLONE_NEWNET) {
+               if (!opts.name) {
+                       ERROR("netns needs a named jail\n");
+                       ret=-1;
+                       goto errout;
+               }
+       }
+
+
+       if (opts.tmpoverlaysize && strlen(opts.tmpoverlaysize) > 8) {
+               ERROR("size parameter too long: \"%s\"\n", opts.tmpoverlaysize);
+               ret=-1;
+               goto errout;
+       }
+
        /* no <binary> param found */
-       if (argc - optind < 1) {
+       if (!opts.ocibundle && (argc - optind < 1)) {
                usage();
-               return EXIT_FAILURE;
+               ret=EXIT_FAILURE;
+               goto errout;
        }
-       if (!(opts.namespace||opts.capabilities||opts.seccomp)) {
+       if (!(opts.ocibundle||opts.namespace||opts.capabilities||opts.seccomp)) {
                ERROR("Not using namespaces, capabilities or seccomp !!!\n\n");
                usage();
-               return EXIT_FAILURE;
+               ret=EXIT_FAILURE;
+               goto errout;
        }
-       DEBUG("Using namespaces(%d), capabilities(%d), seccomp(%d)\n",
+       DEBUG("Using namespaces(0x%08x), capabilities(%d), seccomp(%d)\n",
                opts.namespace,
-               opts.capabilities != 0,
-               opts.seccomp != 0);
+               opts.capset.apply,
+               opts.seccomp != 0 || opts.ociseccomp != 0);
 
-       opts.jail_argv = &argv[optind];
+       uloop_init();
+       signals_init();
 
-       if (opts.namespace && add_path_and_deps(*opts.jail_argv, 1, -1, 0)) {
-               ERROR("failed to load dependencies\n");
-               return -1;
+       parent_ctx = ubus_connect(NULL);
+       ubus_add_uloop(parent_ctx);
+
+       if (opts.ocibundle) {
+               char *objname;
+               if (asprintf(&objname, "container.%s", opts.name) < 0) {
+                       ret=-ENOMEM;
+                       goto errout;
+               }
+
+               container_object.name = objname;
+               ret = ubus_add_object(parent_ctx, &container_object);
+               if (ret) {
+                       ERROR("Failed to add object: %s\n", ubus_strerror(ret));
+                       ret=-1;
+                       goto errout;
+               }
+       }
+
+       /* deliberately not using 'else' on unrelated conditional branches */
+       if (!opts.ocibundle) {
+               /* allocate NULL-terminated array for argv */
+               opts.jail_argv = calloc(1 + argc - optind, sizeof(char**));
+               if (!opts.jail_argv) {
+                       ret=EXIT_FAILURE;
+                       goto errout;
+               }
+               for (size_t s = optind; s < argc; s++)
+                       opts.jail_argv[s - optind] = strdup(argv[s]);
+
+               if (opts.namespace & CLONE_NEWUSER)
+                       get_jail_user(&opts.pw_uid, &opts.pw_gid, &opts.gr_gid);
+       }
+
+       if (!opts.extroot) {
+               if (opts.namespace && add_path_and_deps(*opts.jail_argv, 1, -1, 0)) {
+                       ERROR("failed to load dependencies\n");
+                       ret=-1;
+                       goto errout;
+               }
        }
 
        if (opts.namespace && opts.seccomp && add_path_and_deps("libpreload-seccomp.so", 1, -1, 1)) {
                ERROR("failed to load libpreload-seccomp.so\n");
-               return -1;
+               opts.seccomp = 0;
+               if (opts.require_jail) {
+                       ret=-1;
+                       goto errout;
+               }
+       }
+
+       uloop_timeout_add(&post_main_timeout);
+       uloop_run();
+
+errout:
+       if (opts.ocibundle)
+               cgroups_free();
+
+       free_opts(true);
+
+       return ret;
+}
+
+static void post_main(struct uloop_timeout *t)
+{
+       if (apply_rlimits()) {
+               ERROR("error applying resource limits\n");
+               free_and_exit(EXIT_FAILURE);
        }
 
        if (opts.name)
                prctl(PR_SET_NAME, opts.name, NULL, NULL, NULL);
 
-       uloop_init();
-       if (opts.namespace) {
-               jail_process.pid = clone(spawn_jail,
-                       child_stack + STACK_SIZE,
-                       CLONE_NEWUTS | CLONE_NEWPID | CLONE_NEWNS | CLONE_NEWIPC | SIGCHLD, NULL);
+       if (pipe(&pipes[0]) < 0 || pipe(&pipes[2]) < 0)
+               free_and_exit(-1);
+
+       if (has_namespaces()) {
+               if (opts.namespace & CLONE_NEWNS) {
+                       if (!opts.extroot && (opts.user || opts.group)) {
+                               add_mount_bind("/etc/passwd", 1, -1);
+                               add_mount_bind("/etc/group", 1, -1);
+                       }
+
+#if defined(__GLIBC__)
+                       if (!opts.extroot)
+                               add_mount_bind("/etc/nsswitch.conf", 1, -1);
+#endif
+
+                       if (!(opts.namespace & CLONE_NEWNET)) {
+                               add_mount_bind("/etc/resolv.conf", 1, 0);
+                       } else if (opts.setns.net == -1) {
+                               char hostdir[PATH_MAX];
+
+                               snprintf(hostdir, PATH_MAX, "/tmp/resolv.conf-%s.d", opts.name);
+                               mkdir_p(hostdir, 0755);
+                               add_mount(hostdir, "/dev/resolv.conf.d", NULL, MS_BIND | MS_NOEXEC | MS_NOATIME | MS_NOSUID | MS_NODEV | MS_RDONLY, 0, NULL, 0);
+                       }
+
+                       /* default mounts */
+                       add_mount(NULL, "/dev", "tmpfs", MS_NOATIME | MS_NOEXEC | MS_NOSUID, 0, "size=1M", -1);
+                       add_mount(NULL, "/dev/pts", "devpts", MS_NOATIME | MS_NOEXEC | MS_NOSUID, 0, "newinstance,ptmxmode=0666,mode=0620,gid=5", 0);
+
+                       if (opts.procfs || opts.ocibundle) {
+                               add_mount("proc", "/proc", "proc", MS_NOATIME | MS_NODEV | MS_NOEXEC | MS_NOSUID, 0, NULL, -1);
+
+                               /*
+                                * hack to make /proc/sys/net read-write while the rest of /proc/sys is read-only
+                                * which cannot be expressed with OCI spec, but happends to be very useful.
+                                * Only apply it if '/proc/sys' is not already listed as mount, maskedPath or
+                                * readonlyPath.
+                                * If not running in a new network namespace, only make /proc/sys read-only.
+                                * If running in a new network namespace, temporarily stash (ie. mount-bind)
+                                * /proc/sys/net into (totally unrelated, but surely existing) /proc/self/net.
+                                * Then we mount-bind /proc/sys read-only and then mount-move /proc/self/net into
+                                * /proc/sys/net.
+                                * This works because mounts are executed in incrementing strcmp() order and
+                                * /proc/self/net appears there before /proc/sys/net and hence the operation
+                                * succeeds as the bind-mount of /proc/self/net is performed first and then
+                                * move-mount of /proc/sys/net follows because 'e' preceeds 'y' in the ASCII
+                                * table (and in the alphabet).
+                                */
+                               if (!add_mount(NULL, "/proc/sys", NULL, MS_BIND | MS_RDONLY, 0, NULL, -1))
+                                       if (opts.namespace & CLONE_NEWNET)
+                                               if (!add_mount_inner("/proc/self/net", "/proc/sys/net", NULL, MS_MOVE, 0, NULL, -1))
+                                                       add_mount_inner("/proc/sys/net", "/proc/self/net", NULL, MS_BIND, 0, NULL, -1);
+
+                       }
+                       if (opts.sysfs || opts.ocibundle)
+                               add_mount("sysfs", "/sys", "sysfs", MS_RELATIME | MS_NODEV | MS_NOEXEC | MS_NOSUID | MS_RDONLY, 0, NULL, -1);
+
+                       if (opts.ocibundle)
+                               add_mount("shm", "/dev/shm", "tmpfs", MS_NOSUID | MS_NOEXEC | MS_NODEV, 0, "mode=1777", -1);
+
+               }
+
+               if (opts.setns.pid != -1) {
+                       pidns_fd = ns_open_pid("pid", getpid());
+                       setns_open(CLONE_NEWPID);
+               } else {
+                       pidns_fd = -1;
+               }
+
+#ifdef CLONE_NEWTIME
+               if (opts.setns.time != -1) {
+                       timens_fd = ns_open_pid("time", getpid());
+                       setns_open(CLONE_NEWTIME);
+               } else {
+                       timens_fd = -1;
+               }
+#endif
+
+               if (opts.namespace & CLONE_NEWUSER) {
+                       if (prctl(PR_SET_SECUREBITS, SECBIT_NO_SETUID_FIXUP)) {
+                               ERROR("prctl(PR_SET_SECUREBITS) failed: %m\n");
+                               free_and_exit(EXIT_FAILURE);
+                       }
+                       seteuid(opts.root_map_uid);
+               }
+
+               jail_process.pid = clone(exec_jail, child_stack + STACK_SIZE, SIGCHLD | (opts.namespace & (~CLONE_NEWCGROUP)), NULL);
        } else {
                jail_process.pid = fork();
        }
 
        if (jail_process.pid > 0) {
                /* parent process */
+               char sig_buf[1];
+
                uloop_process_add(&jail_process);
-               uloop_run();
-               uloop_done();
-               if (jail_running) {
-                       DEBUG("uloop interrupted, killing jail process\n");
-                       kill(jail_process.pid, SIGTERM);
-                       waitpid(jail_process.pid, NULL, 0);
+               jail_running = 1;
+               seteuid(0);
+               prctl(PR_SET_SECUREBITS, 0);
+
+               if (pidns_fd != -1) {
+                       setns(pidns_fd, CLONE_NEWPID);
+                       close(pidns_fd);
+               }
+#ifdef CLONE_NEWTIME
+               if (timens_fd != -1)
+                       setns(timens_fd, CLONE_NEWTIME);
+                       close(timens_fd);
+               }
+#endif
+               if (opts.setns.net != -1)
+                       close(opts.setns.net);
+               if (opts.setns.ns != -1)
+                       close(opts.setns.ns);
+               if (opts.setns.ipc != -1)
+                       close(opts.setns.ipc);
+               if (opts.setns.uts != -1)
+                       close(opts.setns.uts);
+               if (opts.setns.user != -1)
+                       close(opts.setns.user);
+               if (opts.setns.cgroup != -1)
+                       close(opts.setns.cgroup);
+               close(pipes[1]);
+               close(pipes[2]);
+               if (read(pipes[0], sig_buf, 1) < 1) {
+                       ERROR("can't read from child\n");
+                       free_and_exit(-1);
+               }
+               close(pipes[0]);
+               set_oom_score_adj();
+
+               if (opts.ocibundle)
+                       cgroups_apply(jail_process.pid);
+
+               if (opts.namespace & CLONE_NEWUSER) {
+                       if (write_setgroups(jail_process.pid, true)) {
+                               ERROR("can't write setgroups\n");
+                               free_and_exit(-1);
+                       }
+                       if (!opts.uidmap) {
+                               bool has_gr = (opts.gr_gid != -1);
+                               if (opts.pw_uid != -1) {
+                                       write_single_uid_gid_map(jail_process.pid, 0, opts.pw_uid);
+                                       write_single_uid_gid_map(jail_process.pid, 1, has_gr?opts.gr_gid:opts.pw_gid);
+                               } else {
+                                       write_single_uid_gid_map(jail_process.pid, 0, 65534);
+                                       write_single_uid_gid_map(jail_process.pid, 1, has_gr?opts.gr_gid:65534);
+                               }
+                       } else {
+                               write_uid_gid_map(jail_process.pid, 0, opts.uidmap);
+                               if (opts.gidmap)
+                                       write_uid_gid_map(jail_process.pid, 1, opts.gidmap);
+                       }
+               }
+
+               if (opts.namespace & CLONE_NEWNET) {
+                       netns_fd = ns_open_pid("net", jail_process.pid);
+                       netns_updown(jail_process.pid, true);
+               }
+
+               if (jail_writepid(jail_process.pid)) {
+                       ERROR("failed to write pidfile: %m\n");
+                       free_and_exit(-1);
                }
-               return jail_return_code;
        } else if (jail_process.pid == 0) {
                /* fork child process */
-               return exec_jail();
+               free_and_exit(exec_jail(NULL));
        } else {
-               ERROR("failed to clone/fork: %s\n", strerror(errno));
-               return EXIT_FAILURE;
+               ERROR("failed to clone/fork: %m\n");
+               free_and_exit(EXIT_FAILURE);
+       }
+       run_hooks(opts.hooks.createRuntime, post_create_runtime);
+}
+
+static void post_poststart(void);
+static void post_create_runtime(void)
+{
+       char sig_buf[1];
+
+       sig_buf[0] = 'O';
+       if (write(pipes[3], sig_buf, 1) < 0) {
+               ERROR("can't write to child\n");
+               free_and_exit(-1);
+       }
+
+       jail_oci_state = OCI_STATE_CREATED;
+       if (opts.ocibundle && !opts.immediately)
+               uloop_run(); /* wait for 'start' command via ubus */
+       else
+               pipe_send_start_container(NULL);
+}
+
+static void pipe_send_start_container(struct uloop_timeout *t)
+{
+       char sig_buf[1];
+
+       jail_oci_state = OCI_STATE_RUNNING;
+       sig_buf[0] = '!';
+       if (write(pipes[3], sig_buf, 1) < 0) {
+               ERROR("can't write to child\n");
+               free_and_exit(-1);
+       }
+       close(pipes[3]);
+
+       run_hooks(opts.hooks.poststart, post_poststart);
+}
+
+static void post_poststart(void)
+{
+       uloop_run(); /* idle here while jail is running */
+       if (jail_running) {
+               DEBUG("uloop interrupted, killing jail process\n");
+               kill(jail_process.pid, SIGTERM);
+               uloop_timeout_set(&jail_process_timeout, 1000);
+               uloop_run();
+       }
+       uloop_done();
+       poststop();
+}
+
+static void post_poststop(void);
+static void poststop(void) {
+       if (opts.namespace & CLONE_NEWNET) {
+               setns(netns_fd, CLONE_NEWNET);
+               netns_updown(getpid(), false);
+               close(netns_fd);
        }
+       run_hooks(opts.hooks.poststop, post_poststop);
+}
+
+static void post_poststop(void)
+{
+       free_opts(true);
+       if (parent_ctx)
+               ubus_free(parent_ctx);
+
+       exit(jail_return_code);
 }