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

uterm: vt: fix race by blocking signals before setting them

Browse Source 
We must block the signals before setting the signal handlers to avoid
retrieving them asynchronously.

Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
This commit is contained in:
David Herrmann 2012-10-28 16:17:18 +01:00
parent 616d5bbf6d
commit 4a4ccec363
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/uterm_vt.c
View File

@ -312,6 +312,16 @@ static int real_open(struct uterm_vt *vt, const char *vt_for_seat0)
goto err_reset;
}
sigemptyset(&mask);
sigaddset(&mask, SIGUSR1);
sigaddset(&mask, SIGUSR2);
ret = sigprocmask(SIG_BLOCK, &mask, NULL);
if (ret) {
log_error("cannot block SIGUSR1/2 (%d): %m", errno);
ret = -EFAULT;
goto err_text;
}
memset(&mode, 0, sizeof(mode));
mode.mode = VT_PROCESS;
mode.acqsig = SIGUSR1;
@ -343,13 +353,6 @@ static int real_open(struct uterm_vt *vt, const char *vt_for_seat0)
goto err_setmode;
}
sigemptyset(&mask);
sigaddset(&mask, SIGUSR1);
sigaddset(&mask, SIGUSR2);
ret = sigprocmask(SIG_BLOCK, &mask, NULL);
if (ret)
log_warning("cannot ignore SIGUSR1/2 (%d): %m", errno);
return 0;
err_setmode: