From 9235536f3870301617cac4459200624929ce4238 Mon Sep 17 00:00:00 2001 From: Erik van der Kouwe Date: Fri, 8 Oct 2010 12:50:52 +0000 Subject: [PATCH] Fix select-related bugs: missing cancellations led to potentially forgetting notifies, especially in the case of async drivers --- servers/vfs/select.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/servers/vfs/select.c b/servers/vfs/select.c index 35a017461..5a40dc654 100644 --- a/servers/vfs/select.c +++ b/servers/vfs/select.c @@ -170,7 +170,10 @@ PUBLIC int do_select(void) } } - if (type == -1) return(EBADF); + if (type == -1) { + select_cancel_all(se); + return(EBADF); + } se->type[fd] = type; /* Test filp for select operations if not already done so. e.g., files @@ -210,7 +213,6 @@ PUBLIC int do_select(void) */ r = copy_fdsets(se, se->nfds, TO_PROC); select_cancel_all(se); - se->requestor = NULL; if (r != OK) return(r); else return(se->nreadyfds); @@ -321,7 +323,6 @@ PRIVATE int select_request_asynch(struct filp *f, int *ops, int block) return(SEL_DEFERRED); } - /*===========================================================================* * select_major_match * *===========================================================================*/ @@ -433,6 +434,7 @@ PRIVATE void select_cancel_all(struct selectentry *e) { int fd; + e->requestor = NULL; for(fd = 0; fd < e->nfds; fd++) { struct filp *fp; fp = e->filps[fd]; @@ -516,7 +518,6 @@ PRIVATE void select_return(struct selectentry *se, int r) select_cancel_all(se); copy_fdsets(se, se->nfds, TO_PROC); /* FIXME, return error status */ select_wakeup(se, r ? r : se->nreadyfds); - se->requestor = NULL; } @@ -642,7 +643,6 @@ PUBLIC void select_forget(int proc_e) } select_cancel_all(&selecttab[s]); - selecttab[s].requestor = NULL; return; } @@ -964,9 +964,7 @@ int slot; se->deferred= FALSE; } if (se->nreadyfds > 0 || !se->block) { - copy_fdsets(se, se->nfds, TO_PROC); /* FIXME, return error */ - select_wakeup(se, se->nreadyfds); - se->requestor = NULL; + select_return(se, 0); } } -- 2.44.0