aniani/irssi
1
0
Fork 0
mirror of https://github.com/irssi/irssi.git synced 2024-12-04 14:46:39 -05:00
Code

Improve Capsicum stdio limits to fix terminal state on exit.

Browse Source
This commit is contained in:
Edward Tomasz Napierala 2017-10-11 23:13:06 +01:00
parent 17b195021d
commit 1e66cbd62e
1 changed files with 35 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/core/capsicum.c
View File

@ -360,6 +360,38 @@ static void cmd_capsicum(const char *data, SERVER_REC *server, void *item)
command_runsub("capsicum", data, server, item); command_runsub("capsicum", data, server, item);
} }
/*
* The main difference between this and caph_limit_stdio(3) is that this
* one permits TIOCSETAW, which is requred for restoring the terminal state
* on exit.
*/
static int
limit_stdio_fd(int fd)
{
cap_rights_t rights;
unsigned long cmds[] = { TIOCGETA, TIOCGWINSZ, TIOCSETAW, FIODTYPE };
cap_rights_init(&rights, CAP_READ, CAP_WRITE, CAP_EVENT, CAP_FCNTL,
CAP_FSTAT, CAP_IOCTL, CAP_SEEK);
if (cap_rights_limit(fd, &rights) < 0) {
g_warning("cap_rights_limit(3) failed: %s", strerror(errno));
return (-1);
}
if (cap_ioctls_limit(fd, cmds, nitems(cmds)) < 0) {
g_warning("cap_ioctls_limit(3) failed: %s", strerror(errno));
return (-1);
}
if (cap_fcntls_limit(fd, CAP_FCNTL_GETFL) < 0) {
g_warning("cap_fcntls_limit(3) failed: %s", strerror(errno));
return (-1);
}
return (0);
}
static void cmd_capsicum_enter(void) static void cmd_capsicum_enter(void)
{ {
u_int mode; u_int mode;
@ -411,9 +443,9 @@ static void cmd_capsicum_enter(void)
*/ */
signal(SIGCHLD, SIG_IGN); signal(SIGCHLD, SIG_IGN);
error = caph_limit_stdio(); if (limit_stdio_fd(STDIN_FILENO) != 0 ||
if (error != 0) { limit_stdio_fd(STDOUT_FILENO) != 0 ||
g_warning("caph_limit_stdio(3) failed: %s", strerror(errno)); limit_stdio_fd(STDERR_FILENO) != 0) {
signal_emit("capability mode failed", 1, strerror(errno)); signal_emit("capability mode failed", 1, strerror(errno));
return; return;
} }