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

dom0/qrexec: kill child process on connect timeout

Browse Source 
Sometimes vchan can not detect dead target domain so kill it explicit to not
leave a mess.
This commit is contained in:
Marek Marczykowski 2012-09-25 03:23:54 +02:00
parent 96199058d1
commit d1620d9a32
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
qrexec/qrexec_daemon.c
View File

@ -95,13 +95,14 @@ void init(int xid)
char qrexec_error_log_name[256]; char qrexec_error_log_name[256];
int logfd; int logfd;
int i; int i;
pid_t pid;
if (xid <= 0) { if (xid <= 0) {
fprintf(stderr, "domain id=0?\n"); fprintf(stderr, "domain id=0?\n");
exit(1); exit(1);
} }
signal(SIGUSR1, sigusr1_handler); signal(SIGUSR1, sigusr1_handler);
switch (fork()) { switch (pid=fork()) {
case -1: case -1:
perror("fork"); perror("fork");
exit(1); exit(1);
@ -114,6 +115,7 @@ void init(int xid)
fprintf(stderr, "."); fprintf(stderr, ".");
} }
fprintf(stderr, "Cannot connect to qrexec agent for %d seconds, giving up\n", MAX_STARTUP_TIME); fprintf(stderr, "Cannot connect to qrexec agent for %d seconds, giving up\n", MAX_STARTUP_TIME);
kill(pid, SIGTERM);
exit(1); exit(1);
} }
close(0); close(0);