ericonr
/
util-linux
mirror of https://github.com/ericonr/util-linux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

su: properly clear child PID 

The patch from master branch, somehow lost during su refactoring
rebase.

Reported-by: Tobias Stöckmann <tobias@stoeckmann.org>
Signed-off-by: Karel Zak <kzak@redhat.com>
This commit is contained in:
Karel Zak 2017-02-01 11:58:09 +01:00
parent 242708de5b
commit 6b28328255
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
login-utils/su-common.c
View File

@ -418,11 +418,12 @@ static void create_watching_parent(struct su_context *su)
else
status = 1;
DBG(SIG, ul_debug("child is dead [status=%d]", status));
DBG(SIG, ul_debug("child %d is dead [status=%d]", child, status));
child = (pid_t) -1; /* Don't use the PID anymore! */
} else
status = 1;
if (caught_signal) {
if (caught_signal && child != (pid_t)-1) {
fprintf(stderr, _("\nSession terminated, killing shell..."));
kill(child, SIGTERM);
}
@ -430,10 +431,12 @@ static void create_watching_parent(struct su_context *su)
supam_cleanup(su, PAM_SUCCESS);
if (caught_signal) {
DBG(SIG, ul_debug("killing child"));
sleep(2);
kill(child, SIGKILL);
fprintf(stderr, _(" ...killed.\n"));
if (child != (pid_t)-1) {
DBG(SIG, ul_debug("killing child"));
sleep(2);
kill(child, SIGKILL);
fprintf(stderr, _(" ...killed.\n"));
}
/* Let's terminate itself with the received signal.
*