summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorin Coras <fcoras@cisco.com>2019-04-22 09:49:10 -0700
committerFlorin Coras <florin.coras@gmail.com>2019-04-22 17:59:19 +0000
commit2f61df5764828413a4fd95093e6aabc27b9ff705 (patch)
tree5c201bae79d87171889f8d0f98a9048d73aea79e
parentfacb4d44475cd0040cc8964be30180e1adeb2021 (diff)
vlib epoll: handle file removal on EPOLLIN VPP-1656
Change-Id: I7a3526a8fdf17afb8cc2225bdfbd57f661680992 Signed-off-by: Florin Coras <fcoras@cisco.com>
-rw-r--r--src/vlib/unix/input.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/vlib/unix/input.c b/src/vlib/unix/input.c
index 318043ea6ed..7f49b954cc2 100644
--- a/src/vlib/unix/input.c
+++ b/src/vlib/unix/input.c
@@ -288,6 +288,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 */
+ 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;
}