commit 5517bd34535e4ffffb838a835bb95ddcb77e2bba
author Benoît Ganne <bganne@cisco.com> Fri Aug 30 16:20:12 2019 +0200
committer Dave Barach <openvpp@barachs.net> Mon Sep 30 16:35:15 2019 +0000
tree 278471ee254c8feeff479acb197e4f8ef3cfcd99
parent 328c08d603bb0a9956b82553f1691fd8a5a5de7d

vlib: fix old nodes vector overflow in refork

Type: fix

Change-Id: I81c4cf0ce87288bb2d3c7b9f31e9419290d588b4
Signed-off-by: Benoît Ganne <bganne@cisco.com>

src/vlib/threads.c

diff --git a/src/vlib/threads.c b/src/vlib/threads.c
index 49b6e81..7454d5a 100644
--- a/src/vlib/threads.c
+++ b/src/vlib/threads.c
@@ -1060,11 +1060,7 @@
     clib_mem_alloc_no_fail (vec_len (nm->nodes) * sizeof (*new_n_clone));
   for (j = 0; j < vec_len (nm->nodes); j++)
     {
-      vlib_node_t *old_n_clone;
-      vlib_node_t *new_n;
-
-      new_n = nm->nodes[j];
-      old_n_clone = old_nodes_clone[j];
+      vlib_node_t *new_n = nm->nodes[j];
 
       clib_memcpy_fast (new_n_clone, new_n, sizeof (*new_n));
       /* none of the copied nodes have enqueue rights given out */
@@ -1080,6 +1076,7 @@
 	}
       else
 	{
+	  vlib_node_t *old_n_clone = old_nodes_clone[j];
 	  /* Copy stats if the old data is valid */
 	  clib_memcpy_fast (&new_n_clone->stats_total,
 			    &old_n_clone->stats_total,