norohind/kmscon
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

pty: unblock all signals before exec'ing the child

Browse Source 
When we register signals in the eloop we also block them in our signal
mask. The signal mask is inherited by the child. Therefore, if the child
does not reset its mask (e.g. bash and most normal processes), it will
not receive any of the signals that we handle. So for example C-c
(SIGINT) does nothing in the child process.

We now unblock all signals before we exec the child.

It's also worth noting that if we _ignore_ a signal -
sigaction(SIG_IGN) - this is also inherited and we must reset it to
default. However, we do not ignore signals so this is unneeded.

Here is some more discussion on signalfd and this problem:
https://lwn.net/Articles/415684/

Signed-off-by: Ran Benita <ran234@gmail.com>
Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
This commit is contained in:
Ran Benita 2012-01-23 18:16:09 +02:00 committed by David Herrmann
parent beb4301830
commit d480ec1030
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/pty.c
View File

@ -30,6 +30,7 @@
#include <fcntl.h>
#include <paths.h>
#include <pty.h>
#include <signal.h>
#include <stdlib.h>
#include <string.h>
#include <sys/ioctl.h>
@ -122,10 +123,17 @@ exec_child(int pty_master)
static int fork_pty_child(int master, struct winsize *ws)
{
int ret, saved_errno;
sigset_t sigset;
pid_t pid;
const char *slave_name;
int slave = -1;
/* The child should not inherit our signal mask. */
sigemptyset(&sigset);
ret = sigprocmask(SIG_SETMASK, &sigset, NULL);
if (ret)
log_warn("pty: cannot reset blocked signals: %m\n");
/* This doesn't actually do anything on linux. */
ret = grantpt(master);
if (ret < 0) {