ujail: stop using extern in elf.h

[project/procd.git] / jail / jail.c

diff --git a/jail/jail.c b/jail/jail.c
index f459a5e..9952ed9 100644 (file)
--- a/jail/jail.c
+++ b/jail/jail.c
@@ -193,11 +193,11 @@ static int build_jail_fs()
        rmdir("/old");
        if (opts.procfs) {
                mkdir("/proc", 0755);
-               mount("proc", "/proc", "proc", MS_NOATIME, 0);
+               mount("proc", "/proc", "proc", MS_NOATIME | MS_NODEV | MS_NOEXEC | MS_NOSUID, 0);
        }
        if (opts.sysfs) {
                mkdir("/sys", 0755);
-               mount("sysfs", "/sys", "sysfs", MS_NOATIME, 0);
+               mount("sysfs", "/sys", "sysfs", MS_NOATIME | MS_NODEV | MS_NOEXEC | MS_NOSUID, 0);
        }
        if (opts.ronly)
                mount(NULL, "/", NULL, MS_RDONLY | MS_REMOUNT, 0);
@@ -272,7 +272,7 @@ static int exec_jail()
        exit(EXIT_FAILURE);
 }
 
-static int spawn_jail(void *arg)
+static int spawn_jail(void *_notused)
 {
        if (opts.name && sethostname(opts.name, strlen(opts.name))) {
                ERROR("failed to sethostname: %s\n", strerror(errno));
@@ -424,7 +424,7 @@ int main(int argc, char **argv)
        if (opts.namespace) {
                jail_process.pid = clone(spawn_jail,
                        child_stack + STACK_SIZE,
-                       CLONE_NEWUTS | CLONE_NEWPID | CLONE_NEWNS | CLONE_NEWIPC | SIGCHLD, argv);
+                       CLONE_NEWUTS | CLONE_NEWPID | CLONE_NEWNS | CLONE_NEWIPC | SIGCHLD, NULL);
        } else {
                jail_process.pid = fork();
        }