diff options
| author |   Klement Sekera <ksekera@cisco.com> | 2018-03-27 10:34:43 +0200 |
|---|---|---|
| committer |   Damjan Marion <dmarion.lists@gmail.com> | 2018-04-03 19:56:37 +0000 |
| commit | 3ecc221162d644884048014dbd399a1f78b89700 (patch) | |
| tree | 97c8738ba196ca60447f613c10067cf77b78e662 /src/vnet/feature/feature.c | |
| parent | 104404348fdb54504e65c39182d405bdcee926fd (diff) | |
reassembly: bug fixes
This change fixes a bug which would corrupt features infra by making
feature infra resistant to double-removal. It also fixes 'out of memory'
issue by properly initializing the bihash tables.
Change-Id: I78ac03139234a9a0e0b48e7bdfac1c38a0069e82
Signed-off-by: Klement Sekera <ksekera@cisco.com>
Diffstat (limited to 'src/vnet/feature/feature.c')
| -rw-r--r-- | src/vnet/feature/feature.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/vnet/feature/feature.c b/src/vnet/feature/feature.c index 6756d0d4ea3..89a1951663e 100644 --- a/src/vnet/feature/feature.c +++ b/src/vnet/feature/feature.c @@ -186,7 +186,7 @@ vnet_feature_enable_disable_with_index (u8 arc_index, u32 feature_index, vnet_feature_main_t *fm = &feature_main; vnet_feature_config_main_t *cm; i16 feature_count; - u32 ci; + u32 old_ci, ci; if (arc_index == (u8) ~ 0) return VNET_API_ERROR_INVALID_VALUE; @@ -196,7 +196,7 @@ vnet_feature_enable_disable_with_index (u8 arc_index, u32 feature_index, cm = &fm->feature_config_mains[arc_index]; vec_validate_init_empty (cm->config_index_by_sw_if_index, sw_if_index, ~0); - ci = cm->config_index_by_sw_if_index[sw_if_index]; + old_ci = ci = cm->config_index_by_sw_if_index[sw_if_index]; vec_validate (fm->feature_count_by_sw_if_index[arc_index], sw_if_index); feature_count = fm->feature_count_by_sw_if_index[arc_index][sw_if_index]; @@ -209,6 +209,10 @@ vnet_feature_enable_disable_with_index (u8 arc_index, u32 feature_index, : vnet_config_del_feature) (vlib_get_main (), &cm->config_main, ci, feature_index, feature_config, n_feature_config_bytes); + if (old_ci == ci) + { + return 0; + } cm->config_index_by_sw_if_index[sw_if_index] = ci; /* update feature count */ |