#include <libgen.h>
#include <sched.h>
#include <linux/limits.h>
+#include <signal.h>
#include "capabilities.h"
#include "elf.h"
return 0;
if (ret)
- ERROR("mkdir failed on %s: %s\n", dir, strerror(errno));
+ ERROR("mkdir(%s, %d) failed: %s\n", dir, mask, strerror(errno));
return ret;
}
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));
+ ERROR("creat(%s) failed: %s\n", new, strerror(errno));
return -1;
}
close(fd);
return -1;
}
- DEBUG("mount -B %s %s\n", path, new);
+ DEBUG("mount -B %s %s (%s)\n", path, new, readonly?"ro":"rw");
return 0;
}
{
char jail_root[] = "/tmp/ujail-XXXXXX";
if (mkdtemp(jail_root) == NULL) {
- ERROR("mkdtemp(jail_root) failed: %s\n", strerror(errno));
+ ERROR("mkdtemp(%s) failed: %s\n", jail_root, strerror(errno));
+ return -1;
+ }
+
+ /* oldroot can't be MS_SHARED else pivot_root() fails */
+ if (mount("none", "/", NULL, MS_REC|MS_PRIVATE, NULL)) {
+ ERROR("private mount failed %s\n", strerror(errno));
return -1;
}
}
if (chdir(jail_root)) {
- ERROR("failed to chdir() in the jail root\n");
+ ERROR("chdir(%s) (jail_root) failed: %s\n", jail_root, strerror(errno));
return -1;
}
mkdir(dirbuf, 0755);
if (pivot_root(jail_root, dirbuf) == -1) {
- ERROR("pivot_root failed: %s\n", strerror(errno));
+ ERROR("pivot_root(%s, %s) failed: %s\n", jail_root, dirbuf, strerror(errno));
return -1;
}
if (chdir("/")) {
- ERROR("chdir(/) failed: %s\n", strerror(errno));
+ ERROR("chdir(/) (after pivot_root) failed: %s\n", strerror(errno));
return -1;
}
and will only drop capabilities/apply seccomp filter.\n\n");
}
-static int exec_jail(void)
+static int exec_jail(void *_notused)
{
- char **envp = build_envp(opts.seccomp);
- if (!envp)
- exit(EXIT_FAILURE);
-
if (opts.capabilities && drop_capabilities(opts.capabilities))
exit(EXIT_FAILURE);
exit(EXIT_FAILURE);
}
- 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);
-}
-
-static int spawn_jail(void *_notused)
-{
- if (opts.hostname && sethostname(opts.hostname, strlen(opts.hostname))) {
+ if (opts.namespace && opts.hostname && strlen(opts.hostname) > 0
+ && sethostname(opts.hostname, strlen(opts.hostname))) {
ERROR("sethostname(%s) failed: %s\n", opts.hostname, strerror(errno));
+ exit(EXIT_FAILURE);
}
- if (build_jail_fs()) {
- ERROR("failed to build jail fs");
+ if (opts.namespace && build_jail_fs()) {
+ ERROR("failed to build jail fs\n");
exit(EXIT_FAILURE);
}
- return exec_jail();
+ char **envp = build_envp(opts.seccomp);
+ if (!envp)
+ exit(EXIT_FAILURE);
+
+ 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);
}
static int jail_running = 1;
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 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);
.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)
+{
+ DEBUG("forwarding signal %d to the jailed process\n", signo);
+ kill(jail_process.pid, signo);
+}
+
int main(int argc, char **argv)
{
+ sigset_t sigmask;
uid_t uid = getuid();
char log[] = "/dev/log";
char ubus[] = "/var/run/ubus.sock";
- int ch;
+ int ch, i;
if (uid) {
ERROR("not root, aborting: %s\n", strerror(errno));
break;
case 'C':
opts.capabilities = optarg;
- add_mount(optarg, 1, -1);
break;
case 'c':
opts.no_new_privs = 1;
prctl(PR_SET_NAME, opts.name, NULL, NULL, NULL);
uloop_init();
+
+ sigfillset(&sigmask);
+ for (i = 0; i < _NSIG; i++) {
+ struct sigaction s = { 0 };
+
+ if (!sigismember(&sigmask, i))
+ continue;
+ if ((i == SIGCHLD) || (i == SIGPIPE))
+ continue;
+
+ s.sa_handler = jail_handle_signal;
+ sigaction(i, &s, NULL);
+ }
+
if (opts.namespace) {
- jail_process.pid = clone(spawn_jail,
- child_stack + STACK_SIZE,
- CLONE_NEWUTS | CLONE_NEWPID | CLONE_NEWNS | CLONE_NEWIPC | SIGCHLD, NULL);
+ add_mount("/dev/full", 0, -1);
+ add_mount("/dev/null", 0, -1);
+ add_mount("/dev/urandom", 0, -1);
+ add_mount("/dev/zero", 0, -1);
+
+ int flags = CLONE_NEWPID | CLONE_NEWNS | CLONE_NEWIPC | SIGCHLD;
+ if (opts.hostname)
+ flags |= CLONE_NEWUTS;
+ jail_process.pid = clone(exec_jail, child_stack + STACK_SIZE, flags, NULL);
} else {
jail_process.pid = fork();
}
/* parent process */
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);
+ uloop_timeout_set(&jail_process_timeout, 1000);
+ uloop_run();
}
+ uloop_done();
return jail_return_code;
} else if (jail_process.pid == 0) {
/* fork child process */
- return exec_jail();
+ return exec_jail(NULL);
} else {
ERROR("failed to clone/fork: %s\n", strerror(errno));
return EXIT_FAILURE;
projects / project / procd.git / blobdiff