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

win: unmask evtchn before checking if libvchan_wait is needed

Browse Source 
This should prevent the race, when evtchn is signalled between condition check
and libvchan_wait call.
This commit is contained in:
Marek Marczykowski 2012-08-03 02:02:26 +02:00
parent 847fe81dcd
commit ec47c5eb81
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
vchan/io.c
View File

@ -125,6 +125,12 @@ int libvchan_write(struct libvchan *ctrl, char *data, int size)
{ {
int avail, avail_contig; int avail, avail_contig;
int real_idx; int real_idx;
#ifdef WINNT
// because of mask-on-fire and do_notify called previously, evtchn must be
// unmasked before libvchan_wait. Do it before checking if data is
// available to prevent race
libvchan_prepare_to_select(ctrl);
#endif
while ((avail = libvchan_buffer_space(ctrl)) == 0) while ((avail = libvchan_buffer_space(ctrl)) == 0)
if (libvchan_wait(ctrl) < 0) if (libvchan_wait(ctrl) < 0)
return -1; return -1;
@ -150,6 +156,12 @@ int libvchan_read(struct libvchan *ctrl, char *data, int size)
{ {
int avail, avail_contig; int avail, avail_contig;
int real_idx; int real_idx;
#ifdef WINNT
// because of mask-on-fire and do_notify called previously, evtchn must be
// unmasked before libvchan_wait. Do it before checking if data is
// available to prevent race
libvchan_prepare_to_select(ctrl);
#endif
while ((avail = libvchan_data_ready(ctrl)) == 0) while ((avail = libvchan_data_ready(ctrl)) == 0)
if (libvchan_wait(ctrl) < 0) if (libvchan_wait(ctrl) < 0)
return -1; return -1;