From 0453ad01468460d5fca09457ed7c862685076931 Mon Sep 17 00:00:00 2001 From: nicm Date: Wed, 12 Jul 2017 09:24:17 +0000 Subject: Move signal code into proc.c. --- window.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'window.c') diff --git a/window.c b/window.c index 437a49d1..5c0cf01d 100644 --- a/window.c +++ b/window.c @@ -943,7 +943,7 @@ window_pane_spawn(struct window_pane *wp, int argc, char **argv, environ_set(env, "TMUX_PANE", "%%%u", wp->id); environ_push(env); - clear_signals(1); + proc_clear_signals(server_proc); log_close(); setenv("SHELL", wp->shell, 1); -- cgit From 51112221eeb31ced907f0dfcf077582996c20c07 Mon Sep 17 00:00:00 2001 From: nicm Date: Wed, 12 Jul 2017 10:04:51 +0000 Subject: Block signals between forking and clearing signal handlers (or calling event_reinit) - if the child gets a signal and fires the libevent signal handler during this period it could write a signal into the parent's signal pipe. GitHub issue 1001 from Aaron van Geffen. --- window.c | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) (limited to 'window.c') diff --git a/window.c b/window.c index 5c0cf01d..08d2c6e5 100644 --- a/window.c +++ b/window.c @@ -22,6 +22,7 @@ #include #include #include +#include #include #include #include @@ -886,6 +887,7 @@ window_pane_spawn(struct window_pane *wp, int argc, char **argv, const char *ptr, *first, *home; struct termios tio2; int i; + sigset_t set, oldset; if (wp->fd != -1) { bufferevent_free(wp->event); @@ -915,14 +917,21 @@ window_pane_spawn(struct window_pane *wp, int argc, char **argv, ws.ws_col = screen_size_x(&wp->base); ws.ws_row = screen_size_y(&wp->base); - wp->pid = fdforkpty(ptm_fd, &wp->fd, wp->tty, NULL, &ws); - switch (wp->pid) { + sigfillset(&set); + sigprocmask(SIG_BLOCK, &set, &oldset); + switch (wp->pid = fdforkpty(ptm_fd, &wp->fd, wp->tty, NULL, &ws)) { case -1: wp->fd = -1; + xasprintf(cause, "%s: %s", cmd, strerror(errno)); free(cmd); + + sigprocmask(SIG_SETMASK, &oldset, NULL); return (-1); case 0: + proc_clear_signals(server_proc); + sigprocmask(SIG_SETMASK, &oldset, NULL); + if (chdir(wp->cwd) != 0) { if ((home = find_home()) == NULL || chdir(home) != 0) chdir("/"); @@ -936,6 +945,7 @@ window_pane_spawn(struct window_pane *wp, int argc, char **argv, if (tcsetattr(STDIN_FILENO, TCSANOW, &tio2) != 0) fatal("tcgetattr failed"); + log_close(); closefrom(STDERR_FILENO + 1); if (path != NULL) @@ -943,9 +953,6 @@ window_pane_spawn(struct window_pane *wp, int argc, char **argv, environ_set(env, "TMUX_PANE", "%%%u", wp->id); environ_push(env); - proc_clear_signals(server_proc); - log_close(); - setenv("SHELL", wp->shell, 1); ptr = strrchr(wp->shell, '/'); @@ -978,6 +985,7 @@ window_pane_spawn(struct window_pane *wp, int argc, char **argv, fatal("execl failed"); } + sigprocmask(SIG_SETMASK, &oldset, NULL); setblocking(wp->fd, 0); wp->event = bufferevent_new(wp->fd, window_pane_read_callback, NULL, -- cgit