stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8224181: On child process spawn, child may write to random file descriptor instead of the fail pipe

Browse Source 
Reviewed-by: rriggs, martin
This commit is contained in:
Thomas Stuefe 2019-06-05 08:59:17 +02:00
parent dbc3f88d5c
commit 7fa6705cb3
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/java.base/unix/native/libjava/childproc.c
View File

@ -313,6 +313,7 @@ int
childProcess(void *arg)
{
const ChildStuff* p = (const ChildStuff*) arg;
int fail_pipe_fd = p->fail[1];
/* Close the parent sides of the pipes.
Closing pipe fds here is redundant, since closeDescriptors()
@ -343,9 +344,12 @@ childProcess(void *arg)
goto WhyCantJohnnyExec;
}
if (moveDescriptor(p->fail[1], FAIL_FILENO) == -1)
if (moveDescriptor(fail_pipe_fd, FAIL_FILENO) == -1)
goto WhyCantJohnnyExec;
/* We moved the fail pipe fd */
fail_pipe_fd = FAIL_FILENO;
/* close everything */
if (closeDescriptors() == 0) { /* failed, close the old way */
int max_fd = (int)sysconf(_SC_OPEN_MAX);
@ -377,9 +381,9 @@ childProcess(void *arg)
*/
{
int errnum = errno;
restartableWrite(FAIL_FILENO, &errnum, sizeof(errnum));
restartableWrite(fail_pipe_fd, &errnum, sizeof(errnum));
}
close(FAIL_FILENO);
close(fail_pipe_fd);
_exit(-1);
return 0; /* Suppress warning "no return value from function" */
}