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

vm/qrexec: better handle the case when child process closes its stdin

Browse Source 
Instead of assuming process termination (because of write returned EPIPE), just
do not write to the process pipe, but still process the data in opposite
direction until EOF received.
This commit is contained in:
Marek Marczykowski 2012-08-27 00:24:02 +02:00
parent 798d239c15
commit 6984c4d795
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
qrexec/qrexec_agent.c
View File

@ -239,8 +239,9 @@ void remove_process(int client_id, int status)
int i;
if (!client_info[client_id].pid)
return;
fork_and_flush_stdin(client_info[client_id].stdin_fd,
&client_info[client_id].buffer);
if (client_info[client_id].stdin_fd >= 0)
fork_and_flush_stdin(client_info[client_id].stdin_fd,
&client_info[client_id].buffer);
#if 0
// let's let it die by itself, possibly after it has received buffered stdin
kill(client_info[client_id].pid, SIGKILL);
@ -283,7 +284,7 @@ void handle_input(int client_id, int len)
char buf[len];
read_all_vchan_ext(buf, len);
if (!client_info[client_id].pid)
if (!client_info[client_id].pid || client_info[client_id].stdin_fd == -1)
return;
if (len == 0) {
@ -306,7 +307,10 @@ void handle_input(int client_id, int len)
client_info[client_id].is_blocked = 1;
break;
case WRITE_STDIN_ERROR:
remove_process(client_id, 128);
// do not remove process, as it still can write data to stdout
close(client_info[client_id].stdin_fd);
client_info[client_id].stdin_fd = -1;
client_info[client_id].is_blocked = 0;
break;
default:
fprintf(stderr, "unknown write_stdin?\n");
@ -494,7 +498,11 @@ void flush_client_data_agent(int client_id)
}
break;
case WRITE_STDIN_ERROR:
remove_process(client_id, 128);
// do not remove process, as it still can write data to stdout
info->is_blocked = 0;
close(info->stdin_fd);
info->stdin_fd = -1;
info->is_close_after_flush_needed = 0;
break;
case WRITE_STDIN_BUFFERED:
break;