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

qrexec-lib: prevent deadlock on vchan

Browse Source 
It can happen that we already cleared libvchan_fd pending state via
libvchan_wait, but data arrived later. This is especially true just
after connection, when client send unsolicited notification to server,
which can confuse it with some requested notification.
This commit is contained in:
Marek Marczykowski 2013-06-07 05:22:13 +02:00 committed by Marek Marczykowski-Górecki
parent dc41fbad79
commit 08f6f18af7
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -60,6 +60,8 @@ int wait_for_vchan_or_argfd_once(libvchan_t *ctrl, int max, fd_set * rdset, fd_s
// the following will never block; we need to do this to // the following will never block; we need to do this to
// clear libvchan_fd pending state // clear libvchan_fd pending state
libvchan_wait(ctrl); libvchan_wait(ctrl);
if (libvchan_data_ready(ctrl))
return 1;
return ret; return ret;
} }