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

qrexec: in agent, use nonzero "fake" pid for existing process

Browse Source 
Because 0 means invalid entry.
Also make sure that the rest of code handles -1 pid fine.
This commit is contained in:
Rafal Wojtczuk 2011-07-05 13:04:34 +02:00
parent 2c23891856
commit 1e355f11d2
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
qrexec/qrexec_agent.c
View File

@ -197,7 +197,7 @@ void handle_connect_existing(int client_id, int len)
char buf[len]; char buf[len];
read_all_vchan_ext(buf, len); read_all_vchan_ext(buf, len);
sscanf(buf, "%d %d %d", &stdin_fd, &stdout_fd, &stderr_fd); sscanf(buf, "%d %d %d", &stdin_fd, &stdout_fd, &stderr_fd);
create_info_about_client(client_id, 0, stdin_fd, stdout_fd, create_info_about_client(client_id, -1, stdin_fd, stdout_fd,
stderr_fd); stderr_fd);
client_info[client_id].is_exited = 1; //do not wait for SIGCHLD client_info[client_id].is_exited = 1; //do not wait for SIGCHLD
} }
@ -459,7 +459,7 @@ int fill_fds_for_select(fd_set * rdset, fd_set * wrset)
max = passfd_socket; max = passfd_socket;
for (i = 0; i < MAX_FDS; i++) for (i = 0; i < MAX_FDS; i++)
if (client_info[i].pid > 0 && client_info[i].is_blocked) { if (client_info[i].pid && client_info[i].is_blocked) {
fd = client_info[i].stdin_fd; fd = client_info[i].stdin_fd;
FD_SET(fd, wrset); FD_SET(fd, wrset);
if (fd > max) if (fd > max)
@ -557,7 +557,7 @@ int main()
handle_process_data_all(&rdset); handle_process_data_all(&rdset);
for (i = 0; i <= MAX_FDS; i++) for (i = 0; i <= MAX_FDS; i++)
if (client_info[i].pid > 0 if (client_info[i].pid
&& client_info[i].is_blocked && client_info[i].is_blocked
&& FD_ISSET(client_info[i].stdin_fd, &wrset)) && FD_ISSET(client_info[i].stdin_fd, &wrset))
flush_client_data_agent(i); flush_client_data_agent(i);