emo/shadow
1
0
Fork 0
Code Issues Pull Requests Packages Releases Activity

Merge pull request #423 from lrh2000/su-fix-sigkill

Browse Source 
su: Fix never alarmed SIGKILL when session terminates
This commit is contained in:
Serge Hallyn 2021-10-31 12:36:03 -05:00 committed by GitHub
commit 387da46d73
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/su.c
View File

@ -397,22 +397,28 @@ static void prepare_pam_close_session (void)
snprintf (kill_msg, sizeof kill_msg, _(" ...killed.\n")); snprintf (kill_msg, sizeof kill_msg, _(" ...killed.\n"));
snprintf (wait_msg, sizeof wait_msg, _(" ...waiting for child to terminate.\n")); snprintf (wait_msg, sizeof wait_msg, _(" ...waiting for child to terminate.\n"));
/* Any signals other than SIGCHLD and SIGALRM will no longer have any effect,
* so it's time to block all of them. */
sigfillset (&ourset);
if (sigprocmask (SIG_BLOCK, &ourset, NULL) != 0) {
fprintf (stderr, _("%s: signal masking malfunction\n"), Prog);
kill_child (0);
/* Never reach (_exit called). */
}
/* Send SIGKILL to the child if it doesn't
* exit within 2 seconds (after SIGTERM) */
(void) signal (SIGALRM, kill_child); (void) signal (SIGALRM, kill_child);
(void) signal (SIGCHLD, catch_signals); (void) signal (SIGCHLD, catch_signals);
(void) alarm (2); (void) alarm (2);
sigemptyset (&ourset); (void) sigdelset (&ourset, SIGALRM);
if ((sigaddset (&ourset, SIGALRM) != 0) (void) sigdelset (&ourset, SIGCHLD);
|| (sigprocmask (SIG_BLOCK, &ourset, NULL) != 0)) {
fprintf (stderr, _("%s: signal masking malfunction\n"), Prog); while (0 == waitpid (pid_child, &status, WNOHANG)) {
kill_child (0); sigsuspend (&ourset);
} else {
while (0 == waitpid (pid_child, &status, WNOHANG)) {
sigsuspend (&ourset);
}
pid_child = 0;
(void) sigprocmask (SIG_UNBLOCK, &ourset, NULL);
} }
pid_child = 0;
(void) fputs (_(" ...terminated.\n"), stderr); (void) fputs (_(" ...terminated.\n"), stderr);
} }