session: fix out of bounds event memcpy

[vpp.git] / src / vlib / threads_cli.c

diff --git a/src/vlib/threads_cli.c b/src/vlib/threads_cli.c
index 65b3e2a..9b30466 100644 (file)
--- a/src/vlib/threads_cli.c
+++ b/src/vlib/threads_cli.c
@@ -43,6 +43,7 @@ static clib_error_t *
 show_threads_fn (vlib_main_t * vm,
                 unformat_input_t * input, vlib_cli_command_t * cmd)
 {
+  const vlib_thread_main_t *tm = vlib_get_thread_main ();
   vlib_worker_thread_t *w;
   int i;
 
@@ -64,11 +65,11 @@ show_threads_fn (vlib_main_t * vm,
       line = format (line, "%-25U", format_sched_policy_and_priority, w->lwp);
 
       int cpu_id = w->cpu_id;
-      if (cpu_id > -1)
+      if (cpu_id > -1 && tm->main_lcore != ~0)
        {
          int core_id = w->core_id;
-         int socket_id = w->socket_id;
-         line = format (line, "%-7u%-7u%-7u%", cpu_id, core_id, socket_id);
+         int numa_id = w->numa_id;
+         line = format (line, "%-7u%-7u%-7u%", cpu_id, core_id, numa_id);
        }
       else
        {
@@ -290,8 +291,8 @@ show_frame_queue_internal (vlib_main_t * vm,
          vlib_cli_output (vm,
                           "  vector-threshold %d  ring size %d  in use %d\n",
                           fqt->threshold, fqt->nelts, fqt->n_in_use);
-         vlib_cli_output (vm, "  head %12d  head_hint %12d  tail %12d\n",
-                          fqt->head, fqt->head_hint, fqt->tail);
+         vlib_cli_output (vm, "  head %12d  tail %12d\n", fqt->head,
+                          fqt->tail);
          vlib_cli_output (vm,
                           "  %3d %3d %3d %3d %3d %3d %3d %3d %3d %3d %3d %3d %3d %3d %3d %3d\n",
                           fqt->n_vectors[0], fqt->n_vectors[1],