summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteven Luong <sluong@cisco.com>2021-04-08 09:31:27 -0700
committerSteven Luong <sluong@cisco.com>2021-04-08 09:39:26 -0700
commit89ca7df0deb48cf8a9d4e6a68f11a5ad6d6d6787 (patch)
tree5c5a6ea5fdbb242cd07387851310649391e80442
parentfda21c97017c1f7bcfa1a0903ca605b89f3148f0 (diff)
avf: crash on avf interface delete
When deleting an avf interface which is not the very first interface that was created (dev_instance == 0), VPP crashes. The reason is every avf interface delete always removes the very first device instance due to ad->dev_instance was wiped out prior to the statement pool_put_index (am->devices, ad->dev_instance) Type: fix Signed-off-by: Steven Luong <sluong@cisco.com> Change-Id: I69bd1588aab9a176f8eef46be7aa5063f5d29482
-rw-r--r--src/plugins/avf/device.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/plugins/avf/device.c b/src/plugins/avf/device.c
index c58b5124e68..14ad47c9854 100644
--- a/src/plugins/avf/device.c
+++ b/src/plugins/avf/device.c
@@ -1469,6 +1469,7 @@ avf_delete_if (vlib_main_t * vm, avf_device_t * ad, int with_barrier)
vnet_main_t *vnm = vnet_get_main ();
avf_main_t *am = &avf_main;
int i;
+ u32 dev_instance;
ad->flags &= ~AVF_DEVICE_F_ADMIN_UP;
@@ -1523,8 +1524,9 @@ avf_delete_if (vlib_main_t * vm, avf_device_t * ad, int with_barrier)
vec_free (ad->name);
clib_error_free (ad->error);
+ dev_instance = ad->dev_instance;
clib_memset (ad, 0, sizeof (*ad));
- pool_put_index (am->devices, ad->dev_instance);
+ pool_put_index (am->devices, dev_instance);
clib_mem_free (ad);
}