From 61dfa1365ea65b3b133153c583a7a7d3764eaadd Mon Sep 17 00:00:00 2001 From: Daniel Eklöf Date: Sun, 3 Nov 2019 13:24:15 +0100 Subject: slave: restore signals before calling exec() --- slave.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) (limited to 'slave.c') diff --git a/slave.c b/slave.c index 939293dd..0b453c5d 100644 --- a/slave.c +++ b/slave.c @@ -5,6 +5,7 @@ #include #include #include +#include #include #include @@ -88,6 +89,18 @@ slave_spawn(int ptmx, int argc, char *const *argv, /* Child */ close(fork_pipe[0]); /* Close read end */ + /* Restore signals */ + const struct sigaction sa = {.sa_handler = SIG_DFL}; + if (sigaction(SIGINT, &sa, NULL) < 0 || + sigaction(SIGTERM, &sa, NULL) < 0 || + sigaction(SIGHUP, &sa, NULL) < 0) + { + const int _errno = errno; + LOG_ERRNO_P("failed to restore signals", errno); + (void)!write(fork_pipe[1], &_errno, sizeof(_errno)); + _exit(_errno); + } + setenv("TERM", term_env, 1); char **_shell_argv = NULL; @@ -134,7 +147,6 @@ slave_spawn(int ptmx, int argc, char *const *argv, LOG_ERRNO("failed to set FD_CLOEXEC on ptmx"); return -1; } - break; } } -- cgit v1.3