sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-10 01:18:15 +03:00
Code

tevent: don't skip a fd event if the previous one was deleted during poll()

Browse Source 
In a threaded environment it can happen that an tevent_fd is talloc_free'ed
while the main thread sleeps in the poll() syscall.

In such a case poll_event_fd_destructor() would set poll_ev->fdes[i] = NULL.

We then skip the removed event, but before we also skipped the one
that was located at the end of the array. We moved it to possition
'i', but the next loop uses 'i=i+1'.

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
This commit is contained in:
Stefan Metzmacher 2013-02-17 23:21:28 +01:00 committed by Jeremy Allison
parent f86df3e364
commit d5b341d873
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/tevent/tevent_poll.c
View File

@ -443,7 +443,7 @@ static int poll_event_loop_poll(struct tevent_context *ev,
int pollrtn;
int timeout = -1;
unsigned first_fd;
unsigned i;
unsigned i, next_i;
int poll_errno;
if (ev->signal_events && tevent_common_check_signal(ev)) {
@ -490,11 +490,13 @@ static int poll_event_loop_poll(struct tevent_context *ev,
which ones and call the handler, being careful to allow
the handler to remove itself when called */
for (i=first_fd; i<poll_ev->num_fds; i++) {
for (i=first_fd; i<poll_ev->num_fds; i = next_i) {
struct pollfd *pfd;
struct tevent_fd *fde;
uint16_t flags = 0;
next_i = i + 1;
fde = poll_ev->fdes[i];
if (fde == NULL) {
/*
@ -502,11 +504,16 @@ static int poll_event_loop_poll(struct tevent_context *ev,
* from the arrays
*/
poll_ev->num_fds -= 1;
if (poll_ev->num_fds == i) {
break;
}
poll_ev->fds[i] = poll_ev->fds[poll_ev->num_fds];
poll_ev->fdes[i] = poll_ev->fdes[poll_ev->num_fds];
if (poll_ev->fdes[i] != NULL) {
poll_ev->fdes[i]->additional_flags = i;
}
/* we have to reprocess position 'i' */
next_i = i;
continue;
}