#include <libubox/uloop.h>
#define STACK_SIZE (1024 * 1024)
-#define OPT_ARGS "P:S:C:n:r:w:d:psulo"
+#define OPT_ARGS "S:C:n:h:r:w:d:psuloc"
static struct {
- char *path;
char *name;
+ char *hostname;
char **jail_argv;
char *seccomp;
char *capabilities;
+ int no_new_privs;
int namespace;
int procfs;
int ronly;
static int build_jail_fs(void)
{
- if (mount("tmpfs", opts.path, "tmpfs", MS_NOATIME, "mode=0755")) {
- ERROR("tmpfs mount failed %s\n", strerror(errno));
- return -1;
- }
-
- if (chdir(opts.path)) {
- ERROR("failed to chdir() in the jail root\n");
+ char jail_root[] = "/tmp/ujail-XXXXXX";
+ if (mkdtemp(jail_root) == NULL) {
+ ERROR("mkdtemp(jail_root) failed: %s\n", strerror(errno));
return -1;
}
- if (add_path_and_deps(*opts.jail_argv, 1, -1, 0)) {
- ERROR("failed to load dependencies\n");
+ if (mount("tmpfs", jail_root, "tmpfs", MS_NOATIME, "mode=0755")) {
+ ERROR("tmpfs mount failed %s\n", strerror(errno));
return -1;
}
- if (opts.seccomp && add_path_and_deps("libpreload-seccomp.so", 1, -1, 1)) {
- ERROR("failed to load libpreload-seccomp.so\n");
+ if (chdir(jail_root)) {
+ ERROR("failed to chdir() in the jail root\n");
return -1;
}
- if (mount_all(opts.path)) {
+ if (mount_all(jail_root)) {
ERROR("mount_all() failed\n");
return -1;
}
- char *mpoint;
- if (asprintf(&mpoint, "%s/old", opts.path) < 0) {
- ERROR("failed to alloc pivot path: %s\n", strerror(errno));
+ 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 failed: %s\n", strerror(errno));
return -1;
}
- mkdir_p(mpoint, 0755);
- if (pivot_root(opts.path, mpoint) == -1) {
- ERROR("pivot_root failed:%s\n", strerror(errno));
- free(mpoint);
+ if (chdir("/")) {
+ ERROR("chdir(/) failed: %s\n", strerror(errno));
return -1;
}
- free(mpoint);
+
+ snprintf(dirbuf, sizeof(dirbuf), "/old%s", jail_root);
+ rmdir(dirbuf);
umount2("/old", MNT_DETACH);
rmdir("/old");
+
if (opts.procfs) {
mkdir("/proc", 0755);
mount("proc", "/proc", "proc", MS_NOATIME | MS_NODEV | MS_NOEXEC | MS_NOSUID, 0);
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, " -P <path>\tpath where the jail will be staged\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");
static int exec_jail(void)
{
- char **envp = build_envp(opts.seccomp);
- if (!envp)
+ if (opts.capabilities && drop_capabilities(opts.capabilities))
exit(EXIT_FAILURE);
- if (opts.capabilities && drop_capabilities(opts.capabilities))
+ 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);
+ }
+
+ 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
+ /* 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.name && sethostname(opts.name, strlen(opts.name))) {
- ERROR("failed to sethostname: %s\n", strerror(errno));
+ if (opts.hostname && sethostname(opts.hostname, strlen(opts.hostname))) {
+ ERROR("sethostname(%s) failed: %s\n", opts.hostname, strerror(errno));
}
if (build_jail_fs()) {
uid_t uid = getuid();
char log[] = "/dev/log";
char ubus[] = "/var/run/ubus.sock";
- int ret = EXIT_SUCCESS;
int ch;
if (uid) {
opts.capabilities = optarg;
add_mount(optarg, 1, -1);
break;
- case 'P':
- opts.namespace = 1;
- opts.path = optarg;
+ case 'c':
+ opts.no_new_privs = 1;
break;
case 'n':
opts.name = optarg;
break;
+ case 'h':
+ opts.hostname = optarg;
+ break;
case 'r':
opts.namespace = 1;
add_path_and_deps(optarg, 1, 0, 0);
}
}
- //no <binary> param found
+ /* no <binary> param found */
if (argc - optind < 1) {
usage();
return EXIT_FAILURE;
opts.jail_argv = &argv[optind];
- if (opts.name)
- prctl(PR_SET_NAME, opts.name, NULL, NULL, NULL);
-
- if (opts.namespace && !opts.path && asprintf(&opts.path, "/tmp/%s", basename(*opts.jail_argv)) == -1) {
- ERROR("failed to asprintf root path: %s\n", strerror(errno));
- return EXIT_FAILURE;
+ if (opts.namespace && add_path_and_deps(*opts.jail_argv, 1, -1, 0)) {
+ ERROR("failed to load dependencies\n");
+ return -1;
}
- if (opts.namespace && mkdir(opts.path, 0755)) {
- ERROR("unable to create root path: %s (%s)\n", opts.path, strerror(errno));
- return EXIT_FAILURE;
+ 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;
}
+ if (opts.name)
+ prctl(PR_SET_NAME, opts.name, NULL, NULL, NULL);
+
uloop_init();
if (opts.namespace) {
jail_process.pid = clone(spawn_jail,
}
if (jail_process.pid > 0) {
- //parent process
+ /* parent process */
uloop_process_add(&jail_process);
uloop_run();
uloop_done();
kill(jail_process.pid, SIGTERM);
waitpid(jail_process.pid, NULL, 0);
}
+ return jail_return_code;
} else if (jail_process.pid == 0) {
- //fork child process
+ /* fork child process */
return exec_jail();
} else {
ERROR("failed to clone/fork: %s\n", strerror(errno));
- ret = EXIT_FAILURE;
- }
-
- if (opts.namespace && rmdir(opts.path)) {
- ERROR("Unable to remove root path: %s (%s)\n", opts.path, strerror(errno));
- ret = EXIT_FAILURE;
+ return EXIT_FAILURE;
}
-
- if (ret)
- return ret;
-
- return jail_return_code;
}
projects / project / procd.git / blobdiff