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

qrexec: in qrexec_client_vm, need to preserve absolute exe name before execv

Browse Source
This commit is contained in:
Rafal Wojtczuk 2011-07-06 16:51:56 +02:00
parent 243d488d99
commit ab6aeb0bca
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
qrexec/qrexec_client_vm.c
View File

@ -63,6 +63,7 @@ int main(int argc, char **argv)
struct trigger_connect_params params; struct trigger_connect_params params;
int local_fd[3], remote_fd[3]; int local_fd[3], remote_fd[3];
int i; int i;
char *abs_exec_path;
if (argc < 4) { if (argc < 4) {
fprintf(stderr, fprintf(stderr,
@ -81,14 +82,14 @@ int main(int argc, char **argv)
local_fd[i] = connect_unix_socket(); local_fd[i] = connect_unix_socket();
read(local_fd[i], &remote_fd[i], sizeof(remote_fd[i])); read(local_fd[i], &remote_fd[i], sizeof(remote_fd[i]));
if (i != 2 || getenv("PASS_LOCAL_STDERR")) { if (i != 2 || getenv("PASS_LOCAL_STDERR")) {
char * env; char *env;
asprintf(&env, "SAVED_FD_%d=%d", i, dup(i)); asprintf(&env, "SAVED_FD_%d=%d", i, dup(i));
putenv(env); putenv(env);
dup2(local_fd[i], i); dup2(local_fd[i], i);
close(local_fd[i]); close(local_fd[i]);
} }
} }
memset(&params, 0, sizeof(params)); memset(&params, 0, sizeof(params));
strncpy(params.exec_index, argv[2], sizeof(params.exec_index)); strncpy(params.exec_index, argv[2], sizeof(params.exec_index));
strncpy(params.target_vmname, argv[1], strncpy(params.target_vmname, argv[1],
@ -100,8 +101,9 @@ int main(int argc, char **argv)
write(trigger_fd, &params, sizeof(params)); write(trigger_fd, &params, sizeof(params));
close(trigger_fd); close(trigger_fd);
abs_exec_path = strdup(argv[3]);
argv[3] = get_program_name(argv[3]); argv[3] = get_program_name(argv[3]);
execv(argv[1], argv + 3); execv(abs_exec_path, argv + 3);
perror("execv"); perror("execv");
return 1; return 1;
} }