From ab3e42b08db051eca5c4516e80ae6c428615a8f9 Mon Sep 17 00:00:00 2001 From: "Igor Mikhailov (imichail)" Date: Sun, 25 Sep 2016 15:11:53 -0700 Subject: [PATCH] Fix for potential use of uninitialized variables The code allowed for the command 'set interface unnumbered' to be processed without specifying any parameters, thus the set logic of the command would have been using uninitialized variables 'unnumbered_sw_if_index' and 'inherit_from_sw_if_index'. Change-Id: I4de14fa1096527c5c48f74304db379f9953760a8 Signed-off-by: Igor Mikhailov (imichail) --- vnet/vnet/interface_cli.c | 36 +++++++++++++----------------------- 1 file changed, 13 insertions(+), 23 deletions(-) diff --git a/vnet/vnet/interface_cli.c b/vnet/vnet/interface_cli.c index 477716d4b97..f7d42a722d5 100644 --- a/vnet/vnet/interface_cli.c +++ b/vnet/vnet/interface_cli.c @@ -815,27 +815,17 @@ set_unnumbered (vlib_main_t * vm, int is_set = 0; int is_del = 0; - while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) - { - - if (unformat (input, "%U use %U", - unformat_vnet_sw_interface, vnm, &unnumbered_sw_if_index, - unformat_vnet_sw_interface, vnm, - &inherit_from_sw_if_index)) - is_set = 1; - else if (unformat (input, "del %U", - unformat_vnet_sw_interface, - vnm, &unnumbered_sw_if_index)) - is_del = 1; - else - { - if (is_set || is_del) - break; - else - return clib_error_return - (0, "parse error '%U'", format_unformat_error, input); - } - } + if (unformat (input, "%U use %U", + unformat_vnet_sw_interface, vnm, &unnumbered_sw_if_index, + unformat_vnet_sw_interface, vnm, &inherit_from_sw_if_index)) + is_set = 1; + else if (unformat (input, "del %U", + unformat_vnet_sw_interface, vnm, + &unnumbered_sw_if_index)) + is_del = 1; + else + return clib_error_return (0, "parse error '%U'", + format_unformat_error, input); si = vnet_get_sw_interface (vnm, unnumbered_sw_if_index); if (is_del) @@ -843,7 +833,7 @@ set_unnumbered (vlib_main_t * vm, si->flags &= ~(VNET_SW_INTERFACE_FLAG_UNNUMBERED); si->unnumbered_sw_if_index = (u32) ~ 0; } - else + else if (is_set) { si->flags |= VNET_SW_INTERFACE_FLAG_UNNUMBERED; si->unnumbered_sw_if_index = inherit_from_sw_if_index; @@ -855,7 +845,7 @@ set_unnumbered (vlib_main_t * vm, /* *INDENT-OFF* */ VLIB_CLI_COMMAND (set_unnumbered_command, static) = { .path = "set interface unnumbered", - .short_help = "set interface unnumbered [ use ][del ]", + .short_help = "set interface unnumbered [ use | del ]", .function = set_unnumbered, }; /* *INDENT-ON* */ -- 2.16.6