diff options
| author |   Florin Coras <fcoras@cisco.com> | 2019-04-18 10:04:03 -0700 |
|---|---|---|
| committer |   Dave Wallace <dwallacelf@gmail.com> | 2019-04-18 18:18:05 +0000 |
| commit | fd2cd9c8993d646d025e05f18f36c9fc22776eb8 (patch) | |
| tree | 1071f8039d5a0cb6c69ca89a5f7386a6ef8621f9 | |
| parent | fd40fdec62f72b77bde141b456fb1d5bf3dc7d06 (diff) | |
vlib epoll: protect against clib file pool expansion
Change-Id: I320e7c2fdacb3056bc448c73fec08d9e2978ee5e
Signed-off-by: Florin Coras <fcoras@cisco.com>
(cherry picked from commit c67078e007c8a9b91def387ba345efa805e45fc5)
| -rw-r--r-- | src/vlib/unix/input.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/vlib/unix/input.c b/src/vlib/unix/input.c index 0edc4e4123f..318043ea6ed 100644 --- a/src/vlib/unix/input.c +++ b/src/vlib/unix/input.c @@ -248,7 +248,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; @@ -287,6 +287,8 @@ 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 */ + f = pool_elt_at_index (fm->file_pool, i); n_errors += errors[n_errors] != 0; } if (e->events & EPOLLOUT) |