Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-02 06:38:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Kill raw input reader's child by process group.

Browse source 
This should help on systems where the default shell (e.g. dash on
Ubuntu) fork-execs in order to run commands.  In that case, we were
just killing the shell and the shell would exit without killing
the actual process corresponding to command that was requested.
Setting a process group for the shell exec'd from Bro and killing
by process group should help clean everything up since process group
will be inherited by any procs that shell fork-execs.
This commit is contained in:
Jon Siwek 2013-09-20 09:38:52 -05:00
parent 3738b4136b
commit e5a4123b4e
1 changed files with 17 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/input/readers/Raw.cc
View file

@ -73,15 +73,15 @@ void Raw::DoClose()
if ( execute && childpid > 0 && kill(childpid, 0) == 0 ) if ( execute && childpid > 0 && kill(childpid, 0) == 0 )
{ {
// kill child process // kill child process group
kill(childpid, SIGTERM); kill(-childpid, SIGTERM);
if ( forcekill ) if ( forcekill )
{ {
usleep(200); // 200 msecs should be enough for anyone ;) usleep(200); // 200 msecs should be enough for anyone ;)
if ( kill(childpid, 0) == 0 ) // perhaps it is already gone if ( kill(childpid, 0) == 0 ) // perhaps it is already gone
kill(childpid, SIGKILL); kill(-childpid, SIGKILL);
} }
} }
} }
@ -146,6 +146,11 @@ bool Raw::Execute()
else if ( childpid == 0 ) else if ( childpid == 0 )
{ {
// we are the child. // we are the child.
// Obtain a process group w/ child's PID.
if ( setpgid(0, 0) == -1 )
_exit(251);
close(pipes[stdout_in]); close(pipes[stdout_in]);
if ( dup2(pipes[stdout_out], stdout_fileno) == -1 ) if ( dup2(pipes[stdout_out], stdout_fileno) == -1 )
_exit(252); _exit(252);
@ -180,6 +185,15 @@ bool Raw::Execute()
else else
{ {
// we are the parent // we are the parent
// Parent also sets child process group immediately to avoid a race.
if ( setpgid(childpid, childpid) == -1 )
{
char buf[256];
strerror_r(errno, buf, sizeof(buf));
Warning(Fmt("Could not set child process group: %s", buf));
}
if ( ! UnlockForkMutex() ) if ( ! UnlockForkMutex() )
return false; return false;