bonding lacp: deleting virtual interface which was enslaved may cause crash

[vpp.git] / src / vnet / bonding / device.c

diff --git a/src/vnet/bonding/device.c b/src/vnet/bonding/device.c
index e977195..77a53b6 100644 (file)
--- a/src/vnet/bonding/device.c
+++ b/src/vnet/bonding/device.c
@@ -777,9 +777,10 @@ bond_process (vlib_main_t * vm, vlib_node_runtime_t * rt, vlib_frame_t * f)
       for (i = 0; i < vec_len (event_data); i++)
        {
          hw_if_index = event_data[i];
-         /* walk hw interface to process all subinterfaces */
-         vnet_hw_interface_walk_sw (vnm, hw_if_index,
-                                    bond_active_interface_switch_cb, 0);
+         if (vnet_get_hw_interface_or_null (vnm, hw_if_index))
+           /* walk hw interface to process all subinterfaces */
+           vnet_hw_interface_walk_sw (vnm, hw_if_index,
+                                      bond_active_interface_switch_cb, 0);
        }
       vec_reset_length (event_data);
     }
@@ -808,6 +809,25 @@ VNET_DEVICE_CLASS (bond_dev_class) = {
 
 /* *INDENT-ON* */
 
+static clib_error_t *
+bond_slave_interface_add_del (vnet_main_t * vnm, u32 sw_if_index, u32 is_add)
+{
+  bond_main_t *bm = &bond_main;
+  slave_if_t *sif;
+  bond_detach_slave_args_t args = { 0 };
+
+  if (is_add)
+    return 0;
+  sif = bond_get_slave_by_sw_if_index (sw_if_index);
+  if (!sif)
+    return 0;
+  args.slave = sw_if_index;
+  bond_detach_slave (bm->vlib_main, &args);
+  return args.error;
+}
+
+VNET_SW_INTERFACE_ADD_DEL_FUNCTION (bond_slave_interface_add_del);
+
 /*
  * fd.io coding-style-patch-verification: ON
  *