From c67078e007c8a9b91def387ba345efa805e45fc5 Mon Sep 17 00:00:00 2001 From: Florin Coras Date: Thu, 18 Apr 2019 10:04:03 -0700 Subject: vlib epoll: protect against clib file pool expansion Change-Id: I320e7c2fdacb3056bc448c73fec08d9e2978ee5e Signed-off-by: Florin Coras --- src/vlib/unix/input.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/vlib/unix/input.c') 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) -- cgit 1.2.3-korg