commit c67078e007c8a9b91def387ba345efa805e45fc5
author Florin Coras <fcoras@cisco.com> Thu Apr 18 10:04:03 2019 -0700
committer Dave Wallace <dwallacelf@gmail.com> Thu Apr 18 18:15:24 2019 +0000
tree e71be2dff0e2d76bca3e253ead2a0719e2d199bd
parent 3c119f8052d7240f53d9960b201a23788e853b35

vlib epoll: protect against clib file pool expansion

Change-Id: I320e7c2fdacb3056bc448c73fec08d9e2978ee5e
Signed-off-by: Florin Coras <fcoras@cisco.com>

src/vlib/unix/input.c

diff --git a/src/vlib/unix/input.c b/src/vlib/unix/input.c
index 0edc4e4..318043e 100644
--- a/src/vlib/unix/input.c
+++ b/src/vlib/unix/input.c
@@ -248,7 +248,7 @@
   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 @@
 	    {
 	      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)