POTD skeleton #37.

Signed-off-by: lns <matzeton@googlemail.com>

1 files changed, 31 insertions, 4 deletions

diff --git a/src/jail.c b/src/jail.c
index d97d702..7f38804 100644
--- a/src/jail.c
+++ b/src/jail.c
@@ -5,6 +5,7 @@
 #include <pty.h>
 #include <sys/epoll.h>
 #include <sys/prctl.h>
+#include <sys/stat.h>
 #include <assert.h>
 
 #include "jail.h"
@@ -250,7 +251,8 @@ static int jail_childfn(void *arg)
 {
     jail_prisoner_process *args;
     const char *path_dev = "/dev";
-    int term_fd;
+    const char *path_devpts = "/dev/pts";
+    int s, term_fd;
     struct termios *term = NULL;
     struct winsize *win = NULL;
     pid_t child_pid;
@@ -273,12 +275,37 @@ static int jail_childfn(void *arg)
         exit(EXIT_FAILURE);
     }
 
-    D2("Mounting %s to %s%s", path_dev, args->newroot, path_dev);
-    if (dir_is_mountpoint(path_dev) > 0) {
+    D2("Mounting rootfs to %s", args->newroot);
+    mount_root();
+
+    D2("Mounting devtmpfs to %s%s", args->newroot, path_dev);
+    s = mkdir(path_dev, S_IRUSR|S_IWUSR|S_IXUSR|
+                        S_IRGRP|S_IXGRP|
+                        S_IROTH|S_IXOTH);
+    if (s && errno != EEXIST) {
+        E2("Could not create directory: %s", path_dev);
+        E_STRERR("mkdir");
+        exit(EXIT_FAILURE);
+    }
+    if (dir_is_mountpoint(path_dev)) {
         W2("%s%s is already a mountpoint", args->newroot, path_dev);
     }
     if (mount_dev(path_dev)) {
-        E2("Can not mount /dev to %s%s", args->newroot, path_dev);
+        E2("Can not mount devtmpfs to %s%s", args->newroot, path_dev);
+        exit(EXIT_FAILURE);
+    }
+
+    D2("Mounting devpts to %s%s", args->newroot, path_devpts);
+    s = mkdir(path_devpts, S_IRUSR|S_IWUSR|S_IXUSR|
+                           S_IRGRP|S_IXGRP|
+                           S_IROTH|S_IXOTH);
+    if (s && errno != EEXIST) {
+        E2("Could not create directory: %s", path_devpts);
+        E_STRERR("mkdir");
+        exit(EXIT_FAILURE);
+    }
+    if (!dir_is_mountpoint(path_devpts) && mount_pts(path_devpts)) {
+        E2("Can not mount devpts to %s%s", args->newroot, path_devpts);
         exit(EXIT_FAILURE);
     }