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

qrexec-lib: fail peer_client_init call when domain dies

Browse Source 
Don't wait indefinitely.
This commit is contained in:
Marek Marczykowski-Górecki 2013-10-27 16:06:26 +01:00
parent 2739340559
commit 2ee40f16c2
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
qrexec-lib/txrx-vchan.c
View File

@ -170,9 +170,10 @@ char *peer_client_init(int dom, int port)
struct xs_handle *xs; struct xs_handle *xs;
char buf[64]; char buf[64];
char *name; char *name;
char *dummy; char *dummy, *dummy2;
unsigned int len = 0; unsigned int len = 0;
char devbuf[128]; char devbuf[128];
char dombuf[128];
unsigned int count; unsigned int count;
char **vec; char **vec;
@ -192,6 +193,7 @@ char *peer_client_init(int dom, int port)
snprintf(devbuf, sizeof(devbuf), snprintf(devbuf, sizeof(devbuf),
"/local/domain/%d/device/vchan/%d/event-channel", dom, "/local/domain/%d/device/vchan/%d/event-channel", dom,
port); port);
snprintf(dombuf, sizeof(dombuf), "/local/domain/%d", dom);
xs_watch(xs, devbuf, devbuf); xs_watch(xs, devbuf, devbuf);
do { do {
vec = xs_read_watch(xs, &count); vec = xs_read_watch(xs, &count);
@ -201,6 +203,15 @@ char *peer_client_init(int dom, int port)
dummy = xs_read(xs, 0, devbuf, &len); dummy = xs_read(xs, 0, devbuf, &len);
if (dummy) if (dummy)
free(dummy); free(dummy);
else {
/* check if domain still alive */
dummy2 = xs_read(xs, 0, dombuf, &len);
if (!dummy2) {
fprintf(stderr, "domain dead\n");
exit(1);
}
free(dummy2);
}
} }
while (!dummy || !len); // wait for the server to create xenstore entries while (!dummy || !len); // wait for the server to create xenstore entries
xs_daemon_close(xs); xs_daemon_close(xs);