woj/nsjail
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make -Me work again

Browse Source
This commit is contained in:
Jagger 2016-05-05 05:44:12 +02:00
parent 2603deb84c
commit 590899b7b8
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
subproc.c
View File

@ -54,12 +54,20 @@ static int subprocNewProc(struct nsjconf_t *nsjconf, int fd_in, int fd_out, int
if (containSetupFD(nsjconf, fd_in, fd_out, fd_err) == false) {
exit(1);
}
char doneChar;
if (utilReadFromFd(pipefd, &doneChar, sizeof(doneChar)) != sizeof(doneChar)) {
exit(1);
}
if (doneChar != subprocDoneChar) {
exit(1);
if (pipefd == -1) {
if (userInitNsFromParent(nsjconf, syscall(__NR_getpid)) == false) {
LOG_E("Couldn't initialize user namespaces");
exit(1);
}
} else {
char doneChar;
if (utilReadFromFd(pipefd, &doneChar, sizeof(doneChar)) != sizeof(doneChar)) {
exit(1);
}
if (doneChar != subprocDoneChar) {
exit(1);
}
}
if (containContain(nsjconf) == false) {
exit(1);