ligang/vpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

vlib: fix vector-as-C-string overflow

Browse Source 
Type: fix

Change-Id: If0419ff1a82d45e5b3326973008e1b9feb290c5a
Signed-off-by: Benoît Ganne <bganne@cisco.com>
This commit is contained in:
Benoît Ganne
2019-12-16 15:49:47 +01:00
committed by Damjan Marion
parent b2f09146c9
commit 62d9fda8e4
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/vlib/cli.c
View File

@ -558,7 +558,7 @@ vlib_cli_dispatch_sub_commands (vlib_main_t * vm,
u32 c; u32 c;
} *ed; } *ed;
ed = ELOG_DATA (&vm->elog_main, e); ed = ELOG_DATA (&vm->elog_main, e);
ed->c = elog_string (&vm->elog_main, c->path); ed->c = elog_string (&vm->elog_main, "%v", c->path);
} }
if (!c->is_mp_safe) if (!c->is_mp_safe)
@ -584,7 +584,7 @@ vlib_cli_dispatch_sub_commands (vlib_main_t * vm,
u32 c, err; u32 c, err;
} *ed; } *ed;
ed = ELOG_DATA (&vm->elog_main, e); ed = ELOG_DATA (&vm->elog_main, e);
ed->c = elog_string (&vm->elog_main, c->path); ed->c = elog_string (&vm->elog_main, "%v", c->path);
if (c_error) if (c_error)
{ {
vec_add1 (c_error->what, 0); vec_add1 (c_error->what, 0);

2
src/vlib/node_cli.c
View File

@ -606,7 +606,7 @@ show_node (vlib_main_t * vm, unformat_input_t * input,
if (n->sibling_of) if (n->sibling_of)
s = format (s, ", sibling-of %s", n->sibling_of); s = format (s, ", sibling-of %s", n->sibling_of);
vlib_cli_output (vm, "node %s, type %s, state %U, index %d%v\n", vlib_cli_output (vm, "node %v, type %s, state %U, index %d%v\n",
n->name, type_str, format_vlib_node_state, vm, n, n->name, type_str, format_vlib_node_state, vm, n,
n->index, s); n->index, s);
vec_reset_length (s); vec_reset_length (s);