diff options
| -rw-r--r-- | src/vlib/unix/input.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/vlib/unix/input.c b/src/vlib/unix/input.c index c6ebb997df4..370e5dddaf6 100644 --- a/src/vlib/unix/input.c +++ b/src/vlib/unix/input.c @@ -247,7 +247,7 @@ linux_epoll_input_inline (vlib_main_t * vm, vlib_node_runtime_t * node, for (e = em->epoll_events; e < em->epoll_events + n_fds_ready; e++) { u32 i = e->data.u32; - clib_file_t *f = fm->file_pool + i; + clib_file_t *f = pool_elt_at_index (fm->file_pool, i); clib_error_t *errors[4]; int n_errors = 0; @@ -286,6 +286,10 @@ linux_epoll_input_inline (vlib_main_t * vm, vlib_node_runtime_t * node, { f->read_events++; errors[n_errors] = f->read_function (f); + /* Make sure f is valid if the file pool moves */ + if (pool_is_free_index (fm->file_pool, i)) + continue; + f = pool_elt_at_index (fm->file_pool, i); n_errors += errors[n_errors] != 0; } if (e->events & EPOLLOUT) |