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

vlib: fix unix cli commands crash without session

Browse Source 
If a cli command is run while there are no cli session, then
cm->cli_file_pool will not be initialized and we should not try to
operate on it.

Type: fix

Change-Id: Iaea15a23f7efd5b17fab13e6c1cbb3a9a34080e0
Signed-off-by: Benoît Ganne <bganne@cisco.com>
(cherry picked from commit a58be82dda89d6496f92e451b42eee31f0cf47b4)
This commit is contained in:
Benoît Ganne
2020-05-11 16:27:29 +02:00
committed by Andrew Yourtchenko
parent d8c4326aae
commit f89bbaac78
1 changed files with 23 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/vlib/unix/cli.c
View File

@ -3232,6 +3232,18 @@ vlib_unix_cli_set_prompt (char *prompt)
cm->cli_prompt = format (0, fmt, prompt);
}
static unix_cli_file_t *
unix_cli_file_if_interactive (unix_cli_main_t * cm)
{
unix_cli_file_t *cf;
if (!cm->cli_file_pool)
return 0;
cf = pool_elt_at_index (cm->cli_file_pool, cm->current_input_file_index);
if (!cf->is_interactive)
return 0;
return cf;
}
/** CLI command to quit the terminal session.
* @note If this is a stdin session then this will
* shutdown VPP also.
@ -3241,8 +3253,10 @@ unix_cli_quit (vlib_main_t * vm,
unformat_input_t * input, vlib_cli_command_t * cmd)
{
unix_cli_main_t *cm = &unix_cli_main;
unix_cli_file_t *cf = pool_elt_at_index (cm->cli_file_pool,
cm->current_input_file_index);
unix_cli_file_t *cf;
if (!(cf = unix_cli_file_if_interactive (cm)))
return clib_error_return (0, "invalid for non-interactive sessions");
/* Cosmetic: suppress the final prompt from appearing before we die */
cf->is_interactive = 0;
@ -3494,9 +3508,7 @@ unix_cli_show_history (vlib_main_t * vm,
unix_cli_file_t *cf;
int i, j;
cf = pool_elt_at_index (cm->cli_file_pool, cm->current_input_file_index);
if (!cf->is_interactive)
if (!(cf = unix_cli_file_if_interactive (cm)))
return clib_error_return (0, "invalid for non-interactive sessions");
if (cf->has_history && cf->history_limit)
@ -3534,7 +3546,9 @@ unix_cli_show_terminal (vlib_main_t * vm,
unix_cli_file_t *cf;
vlib_node_t *n;
cf = pool_elt_at_index (cm->cli_file_pool, cm->current_input_file_index);
if (!(cf = unix_cli_file_if_interactive (cm)))
return clib_error_return (0, "invalid for non-interactive sessions");
n = vlib_get_node (vm, cf->process_node_index);
vlib_cli_output (vm, "Terminal name: %v\n", n->name);
@ -3686,9 +3700,7 @@ unix_cli_set_terminal_pager (vlib_main_t * vm,
unformat_input_t _line_input, *line_input = &_line_input;
clib_error_t *error = 0;
cf = pool_elt_at_index (cm->cli_file_pool, cm->current_input_file_index);
if (!cf->is_interactive)
if (!(cf = unix_cli_file_if_interactive (cm)))
return clib_error_return (0, "invalid for non-interactive sessions");
if (!unformat_user (input, unformat_line_input, line_input))
@ -3745,9 +3757,7 @@ unix_cli_set_terminal_history (vlib_main_t * vm,
u32 limit;
clib_error_t *error = 0;
cf = pool_elt_at_index (cm->cli_file_pool, cm->current_input_file_index);
if (!cf->is_interactive)
if (!(cf = unix_cli_file_if_interactive (cm)))
return clib_error_return (0, "invalid for non-interactive sessions");
if (!unformat_user (input, unformat_line_input, line_input))
@ -3815,9 +3825,7 @@ unix_cli_set_terminal_ansi (vlib_main_t * vm,
unix_cli_main_t *cm = &unix_cli_main;
unix_cli_file_t *cf;
cf = pool_elt_at_index (cm->cli_file_pool, cm->current_input_file_index);
if (!cf->is_interactive)
if (!(cf = unix_cli_file_if_interactive (cm)))
return clib_error_return (0, "invalid for non-interactive sessions");
if (unformat (input, "on"))