diff options
| author |   Matthew Smith <mgsmith@netgate.com> | 2023-04-19 20:02:25 +0000 |
|---|---|---|
| committer |   Dave Barach <vpp@barachs.net> | 2023-04-20 21:11:41 +0000 |
| commit | 5b32d3a13bc66b884bbf25f1409174ed34a8adc7 (patch) | |
| tree | 90dbc2c2bf0284d723c12898d9a482624443b126 | |
| parent | bc4dc16a5ce891649211200f0e346c76cdef4c56 (diff) | |
api: fix trace_plugin_msg_ids segv in trace dump
With 'api-trace { on }' in startup.conf, running 'api trace dump' in
vppctl was causing VPP to seg fault. vl_msg_print_trace() was calling
m->endian_handler() without checking whether its null.
Checking if its non-null prevents a crash, but the trace dump prints
the message IDs for trace_plugin_msg_ids in network byte order. There is
an auto-generated endian function for that message. Set it on the call
to vl_msg_api_config() for trace_plugin_msg_ids so the IDs will be
printed in host byte order in trace dump output.
Type: fix
Fixes: fe45f8f5
Signed-off-by: Matthew Smith <mgsmith@netgate.com>
Change-Id: I0ab463985e9a983155feba13ac4eb99ab883ace6
| -rw-r--r-- | src/vlibmemory/memclnt_api.c | 1 | ||||
| -rw-r--r-- | src/vlibmemory/vlib_api_cli.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/vlibmemory/memclnt_api.c b/src/vlibmemory/memclnt_api.c index 29858dd8497..728edf7804a 100644 --- a/src/vlibmemory/memclnt_api.c +++ b/src/vlibmemory/memclnt_api.c @@ -726,6 +726,7 @@ rpc_api_hookup (vlib_main_t *vm) .id = VL_API_##N, \ .name = #n, \ .handler = vl_api_##n##_t_handler, \ + .endian = vl_api_##n##_t_endian, \ .format_fn = vl_api_##n##_t_format, \ .size = sizeof (vl_api_##n##_t), \ .traced = 1, \ diff --git a/src/vlibmemory/vlib_api_cli.c b/src/vlibmemory/vlib_api_cli.c index 5b62e61a235..f9cda9b34e9 100644 --- a/src/vlibmemory/vlib_api_cli.c +++ b/src/vlibmemory/vlib_api_cli.c @@ -683,7 +683,7 @@ vl_msg_print_trace (u8 *msg, void *ctx) return 0; } - if (clib_arch_is_little_endian) + if (clib_arch_is_little_endian && (m->endian_handler != NULL)) { u32 msg_length = vec_len (msg); vec_validate (tmpbuf, msg_length - 1); |