Qubes/core-agent-linux
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

qrexec: make sure that all the pipes/sockets are closed on cleanup

Browse Source 
This will ensure that the child process will receive info that the
connection is closed. Otherwise it could hang on write() or in some
cases read() - on its stdin/stdout.

Thanks @adrelanos for help with debugging.
This commit is contained in:
Marek Marczykowski-Górecki 2015-08-07 21:45:22 +02:00
parent cc83b8d344
commit 51e2d6d356
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
1 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
qrexec/qrexec-agent-data.c
View File

@ -403,6 +403,26 @@ int process_child_io(libvchan_t *data_vchan,
}
}
}
/* make sure that all the pipes/sockets are closed, so the child process
* (if any) will know that the connection is terminated */
if (stdout_fd != -1) {
if (shutdown(stdout_fd, SHUT_RD) < 0) {
if (errno == ENOTSOCK)
close(stdout_fd);
}
stdout_fd = -1;
}
if (stdin_fd != -1) {
if (shutdown(stdin_fd, SHUT_WR) < 0) {
if (errno == ENOTSOCK)
close(stdin_fd);
}
stdin_fd = -1;
}
if (stderr_fd != -1) {
close(stderr_fd);
stderr_fd = -1;
}
return child_process_status;
}