Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-25 13:51:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 51429: in safe_pclose, we may call kill + waitpid(WNOHANG) 1000 times

Browse Source 
without giving the child any time to receive the SIGKILL signal and
terminate, break out of the while loop, and leave the child behind as a
zombie process.  The patch is contributed by John G. Myers
<jgmyers@speakeasy.net> and Tomas Mraz of Red Hat. r=neil.williams,relyea
This commit is contained in:
wtchang%redhat.com 2007-01-06 01:45:56 +00:00
parent 4085de657d
commit 3108c0b56e
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
security/nss/lib/freebl/unix_rand.c
View File

@ -46,6 +46,7 @@
#include "secrng.h"
#include "secerr.h"
#include "prerror.h"
#include "prthread.h"
size_t RNG_FileUpdate(const char *fileName, size_t limit);
@ -845,25 +846,28 @@ static int
safe_pclose(FILE *fp)
{
pid_t pid;
int count, status;
int status = -1, rv;
if ((pid = safe_popen_pid) == 0)
return -1;
safe_popen_pid = 0;
fclose(fp);
/* yield the processor so the child gets some time to exit normally */
PR_Sleep(PR_INTERVAL_NO_WAIT);
/* if the child hasn't exited, kill it -- we're done with its output */
count = 0;
while (waitpid(pid, &status, WNOHANG) == 0) {
if (kill(pid, SIGKILL) < 0 && errno == ESRCH)
break;
if (++count == 1000)
break;
while ((rv = waitpid(pid, &status, WNOHANG)) == -1 && errno == EINTR)
;
if (rv == 0 && kill(pid, SIGKILL) == 0) {
while ((rv = waitpid(pid, &status, 0)) == -1 && errno == EINTR)
;
}
/* Reset SIGCHLD signal hander before returning */
sigaction(SIGCHLD, &oldact, NULL);
fclose(fp);
return status;
}