chiark / gitweb /
nspawn: chown basic device nodes to userns root
authorLennart Poettering <lennart@poettering.net>
Thu, 19 Feb 2015 11:03:39 +0000 (12:03 +0100)
committerLennart Poettering <lennart@poettering.net>
Thu, 19 Feb 2015 11:03:39 +0000 (12:03 +0100)
src/nspawn/nspawn.c

index 9967423..0d8d199 100644 (file)
@@ -1444,6 +1444,10 @@ static int copy_devnodes(const char *dest) {
 
                         if (mknod(to, st.st_mode, st.st_rdev) < 0)
                                 return log_error_errno(errno, "mknod(%s) failed: %m", to);
+
+                        if (arg_userns && arg_uid_shift != UID_INVALID)
+                                if (lchown(to, arg_uid_shift, arg_uid_shift) < 0)
+                                        return log_error_errno(errno, "chown() of device node %s failed: %m", to);
                 }
         }
 
@@ -1460,6 +1464,10 @@ static int setup_ptmx(const char *dest) {
         if (symlink("pts/ptmx", p) < 0)
                 return log_error_errno(errno, "Failed to create /dev/ptmx symlink: %m");
 
+        if (arg_userns && arg_uid_shift != UID_INVALID)
+                if (lchown(p, arg_uid_shift, arg_uid_shift) < 0)
+                        return log_error_errno(errno, "lchown() of symlink %s failed: %m", p);
+
         return 0;
 }