{ "sysfs", "/sys", "sysfs", NULL, MS_NOSUID|MS_NOEXEC|MS_NODEV|MS_RDONLY, true },
{ "tmpfs", "/dev", "tmpfs", "mode=755", MS_NOSUID, true },
{ "/dev/pts", "/dev/pts", "bind", NULL, MS_BIND, true },
- { "tmpfs", "/dev/.run", "tmpfs", "mode=755", MS_NOSUID|MS_NOEXEC|MS_NODEV, true },
+ { "tmpfs", "/run", "tmpfs", "mode=755", MS_NOSUID|MS_NODEV, true },
#ifdef HAVE_SELINUX
{ "selinux", "/selinux", "selinuxfs", NULL, MS_NOSUID|MS_NOEXEC|MS_NODEV|MS_RDONLY, false },
#endif
unsigned long l;
- for (l = 0; l <= MAX(63LU, (unsigned long) CAP_LAST_CAP); l ++) {
+ for (l = 0; l <= MAX(63LU, (unsigned long) CAP_LAST_CAP); l++) {
unsigned i;
for (i = 0; i < ELEMENTSOF(retain); i++)
/* If this capability is not known, EINVAL
* will be returned, let's ignore this. */
if (errno == EINVAL)
- continue;
+ break;
log_error("PR_CAPBSET_DROP failed: %m");
return -errno;
#define BUFFER_SIZE 1024
static int process_pty(int master, sigset_t *mask) {
+
char in_buffer[BUFFER_SIZE], out_buffer[BUFFER_SIZE];
size_t in_buffer_full = 0, out_buffer_full = 0;
struct epoll_event stdin_ev, stdout_ev, master_ev, signal_ev;
if ((n = read(signal_fd, &sfsi, sizeof(sfsi))) != sizeof(sfsi)) {
if (n >= 0) {
+ log_error("Failed to read from signalfd: invalid block size");
r = -EIO;
goto finish;
}
if (errno != EINTR && errno != EAGAIN) {
+ log_error("Failed to read from signalfd: %m");
r = -errno;
goto finish;
}
if (ioctl(STDIN_FILENO, TIOCGWINSZ, &ws) >= 0)
ioctl(master, TIOCSWINSZ, &ws);
} else {
- r = -EINTR;
+ r = 0;
goto finish;
}
}
stdin_readable = false;
else {
log_error("read(): %m");
+ r = -errno;
goto finish;
}
} else
master_writable = false;
else {
log_error("write(): %m");
+ r = -errno;
goto finish;
}
master_readable = false;
else {
log_error("read(): %m");
+ r = -errno;
goto finish;
}
} else
stdout_writable = false;
else {
log_error("write(): %m");
+ r = -errno;
goto finish;
}