bonding: fix interface deletion

Copy sw_if_index value instead of using pointers to original
bif->slaves content which could be overriden by eg. vec_del1().

Type: feature

Change-Id: I37e458effd6b2367479574f7bd3facd4e93bada4
Signed-off-by: Benoît Ganne <bganne@cisco.com>
(cherry picked from commit cc3aac05697976b512ce68017ca02b27d613eff2)

diff --git a/src/vnet/bonding/cli.c b/src/vnet/bonding/cli.c
index ff458da..4ce8672 100644 (file)
--- a/src/vnet/bonding/cli.c
+++ b/src/vnet/bonding/cli.c
@@ -305,8 +305,7 @@ bond_delete_if (vlib_main_t * vm, u32 sw_if_index)
   slave_if_t *sif;
   vnet_hw_interface_t *hw;
   u32 *sif_sw_if_index;
-  u32 **s_list = 0;
-  u32 i;
+  u32 *s_list = 0;
 
   hw = vnet_get_sup_hw_interface (vnm, sw_if_index);
   if (hw == NULL || bond_dev_class.index != hw->dev_class_index)
@@ -314,21 +313,14 @@ bond_delete_if (vlib_main_t * vm, u32 sw_if_index)
 
   bif = bond_get_master_by_dev_instance (hw->dev_instance);
 
-  vec_foreach (sif_sw_if_index, bif->slaves)
+  vec_append (s_list, bif->slaves);
+  vec_foreach (sif_sw_if_index, s_list)
   {
-    vec_add1 (s_list, sif_sw_if_index);
+    sif = bond_get_slave_by_sw_if_index (*sif_sw_if_index);
+    if (sif)
+      bond_delete_neighbor (vm, bif, sif);
   }
-
-  for (i = 0; i < vec_len (s_list); i++)
-    {
-      sif_sw_if_index = s_list[i];
-      sif = bond_get_slave_by_sw_if_index (*sif_sw_if_index);
-      if (sif)
-       bond_delete_neighbor (vm, bif, sif);
-    }
-
-  if (s_list)
-    vec_free (s_list);
+  vec_free (s_list);
 
   /* bring down the interface */
   vnet_hw_interface_set_flags (vnm, bif->hw_if_index, 0);