summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorBenoît Ganne <bganne@cisco.com>2020-07-24 09:57:11 +0200
committerAndrew Yourtchenko <ayourtch@gmail.com>2020-08-18 19:47:21 +0000
commit7e9f66ec40093b7199841e0ec1b7fdade6ea1471 (patch)
tree54298ad53d8f293c79aab5d60de866045864be46 /src
parent09da69951baf43d1d75c202b4aa021c726ce9550 (diff)
interface: fix show/clear hardware-interfaces string overflow
Type: fix Change-Id: Iab99bc1f6c309fae6eaa714b484274fe7072a4cb Signed-off-by: Benoît Ganne <bganne@cisco.com> (cherry picked from commit 17814d74dbbc85573adbf970644caa4b1ac9bbb4)
Diffstat (limited to 'src')
-rw-r--r--src/vnet/interface_cli.c24
1 files changed, 19 insertions, 5 deletions
diff --git a/src/vnet/interface_cli.c b/src/vnet/interface_cli.c
index 6c4df198548..2356f268435 100644
--- a/src/vnet/interface_cli.c
+++ b/src/vnet/interface_cli.c
@@ -65,16 +65,15 @@ compare_interface_names (void *a1, void *a2)
static clib_error_t *
show_or_clear_hw_interfaces (vlib_main_t * vm,
unformat_input_t * input,
- vlib_cli_command_t * cmd)
+ vlib_cli_command_t * cmd, int is_show)
{
clib_error_t *error = 0;
vnet_main_t *vnm = vnet_get_main ();
vnet_interface_main_t *im = &vnm->interface_main;
vnet_hw_interface_t *hi;
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)
{
/* See if user wants to show a specific interface. */
@@ -168,6 +167,21 @@ done:
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.
* 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",
.short_help = "show hardware-interfaces [brief|verbose|detail] [bond] "
"[<interface> [<interface> [..]]] [<sw_idx> [<sw_idx> [..]]]",
- .function = show_or_clear_hw_interfaces,
+ .function = show_hw_interfaces,
};
/* *INDENT-ON* */
@@ -250,7 +264,7 @@ VLIB_CLI_COMMAND (clear_hw_interface_counters_command, static) = {
.path = "clear hardware-interfaces",
.short_help = "clear hardware-interfaces "
"[<interface> [<interface> [..]]] [<sw_idx> [<sw_idx> [..]]]",
- .function = show_or_clear_hw_interfaces,
+ .function = clear_hw_interfaces,
};
/* *INDENT-ON* */