QubesOS/qubes-core-admin-linux
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

qrexec: use exec_qubes_rpc_if_requested() from qubes-utils

Browse Source 
This avoids duplicating service call parsing in multiple places. For
dom0 part it was in qrexec-policy tool.
Also, add execl() error handling.
This commit is contained in:
Marek Marczykowski-Górecki 2018-02-16 04:22:48 +01:00
parent bdebfe330a
commit 32b0c659a1
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
qrexec/qrexec-client.c
View File

@ -47,6 +47,8 @@ pid_t local_pid = 0;
int is_service = 0; int is_service = 0;
int child_exited = 0; int child_exited = 0;
extern char **environ;
static int handle_agent_handshake(libvchan_t *vchan, int remote_send_first) static int handle_agent_handshake(libvchan_t *vchan, int remote_send_first)
{ {
struct msg_header hdr; struct msg_header hdr;
@ -164,9 +166,15 @@ static void sigchld_handler(int x __attribute__((__unused__)))
} }
/* called from do_fork_exec */ /* called from do_fork_exec */
void do_exec(const char *prog) _Noreturn void do_exec(char *prog)
{ {
/* avoid calling qubes-rpc-multiplexer through shell */
exec_qubes_rpc_if_requested(prog, environ);
/* if above haven't executed qubes-rpc-multiplexer, pass it to shell */
execl("/bin/bash", "bash", "-c", prog, NULL); execl("/bin/bash", "bash", "-c", prog, NULL);
perror("exec bash");
exit(1);
} }
static void do_exit(int code) static void do_exit(int code)