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

interface: fix show/clear hardware-interfaces string overflow

Browse Source 
Type: fix

Change-Id: Iab99bc1f6c309fae6eaa714b484274fe7072a4cb
Signed-off-by: Benoît Ganne <bganne@cisco.com>
(cherry picked from commit 17814d74db)
This commit is contained in:
Benoît Ganne
2020-07-24 09:57:11 +02:00
committed by Andrew Yourtchenko
parent 09da69951b
commit 7e9f66ec40
1 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/vnet/interface_cli.c
View File

@@ -65,16 +65,15 @@ compare_interface_names (void *a1, void *a2)
static clib_error_t * static clib_error_t *
show_or_clear_hw_interfaces (vlib_main_t * vm, show_or_clear_hw_interfaces (vlib_main_t * vm,
unformat_input_t * input, unformat_input_t * input,
vlib_cli_command_t * cmd) vlib_cli_command_t * cmd, int is_show)
{ {
clib_error_t *error = 0; clib_error_t *error = 0;
vnet_main_t *vnm = vnet_get_main (); vnet_main_t *vnm = vnet_get_main ();
vnet_interface_main_t *im = &vnm->interface_main; vnet_interface_main_t *im = &vnm->interface_main;
vnet_hw_interface_t *hi; vnet_hw_interface_t *hi;
u32 hw_if_index, *hw_if_indices = 0; u32 hw_if_index, *hw_if_indices = 0;
int i, verbose = -1, is_show, show_bond = 0; int i, verbose = -1, show_bond = 0;
is_show = strstr (cmd->path, "show") != 0;
while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
{ {
/* See if user wants to show a specific interface. */ /* See if user wants to show a specific interface. */
@@ -168,6 +167,21 @@ done:
return error; return error;
} }
static clib_error_t *
show_hw_interfaces (vlib_main_t * vm,
unformat_input_t * input, vlib_cli_command_t * cmd)
{
return show_or_clear_hw_interfaces (vm, input, cmd, 1 /* is_show */ );
}
static clib_error_t *
clear_hw_interfaces (vlib_main_t * vm,
unformat_input_t * input, vlib_cli_command_t * cmd)
{
return show_or_clear_hw_interfaces (vm, input, cmd, 0 /* is_show */ );
}
/*? /*?
* Display more detailed information about all or a list of given interfaces. * Display more detailed information about all or a list of given interfaces.
* The verboseness of the output can be controlled by the following optional * The verboseness of the output can be controlled by the following optional
@@ -229,7 +243,7 @@ VLIB_CLI_COMMAND (show_hw_interfaces_command, static) = {
.path = "show hardware-interfaces", .path = "show hardware-interfaces",
.short_help = "show hardware-interfaces [brief|verbose|detail] [bond] " .short_help = "show hardware-interfaces [brief|verbose|detail] [bond] "
"[<interface> [<interface> [..]]] [<sw_idx> [<sw_idx> [..]]]", "[<interface> [<interface> [..]]] [<sw_idx> [<sw_idx> [..]]]",
.function = show_or_clear_hw_interfaces, .function = show_hw_interfaces,
}; };
/* *INDENT-ON* */ /* *INDENT-ON* */
@@ -250,7 +264,7 @@ VLIB_CLI_COMMAND (clear_hw_interface_counters_command, static) = {
.path = "clear hardware-interfaces", .path = "clear hardware-interfaces",
.short_help = "clear hardware-interfaces " .short_help = "clear hardware-interfaces "
"[<interface> [<interface> [..]]] [<sw_idx> [<sw_idx> [..]]]", "[<interface> [<interface> [..]]] [<sw_idx> [<sw_idx> [..]]]",
.function = show_or_clear_hw_interfaces, .function = clear_hw_interfaces,
}; };
/* *INDENT-ON* */ /* *INDENT-ON* */