summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChenmin Sun <chenmin.sun@intel.com>2019-11-22 05:33:40 +0800
committerDamjan Marion <dmarion@me.com>2019-11-26 13:27:36 +0000
commitbe2ad0b4743ed8a3875a5b6039c10c66eb07614c (patch)
tree80954b85990daea21693e8cb2e487334b47ef836
parent7dbf9a1a4fff5c3b20ad972289e49e3f88e82f2d (diff)
flow: fix several crash issues
Type: fix This patch fixes crash issues(marked in brackets) in the below test cases test flow enable index 0 1/1 -> [crash] test flow disable index 0 1/1 -> [crash] test flow add src-ip 192.168.8.8 proto udp redirect-to-queue 8 test flow enable index 0 1/1 test flow disable index 0 1/1 - [crash] test flow add src-ip 192.168.8.8 proto udp redirect-to-queue 8 test flow enable index 0 1/1 test flow enable index 0 1/2 test flow del index 0 -> [crash] Signed-off-by: Chenmin Sun <chenmin.sun@intel.com> Change-Id: I84bc6faa3d93a2cab4c82e8a876a8b1067257b62
-rw-r--r--src/plugins/dpdk/device/flow.c2
-rw-r--r--src/vnet/flow/flow.c6
2 files changed, 6 insertions, 2 deletions
diff --git a/src/plugins/dpdk/device/flow.c b/src/plugins/dpdk/device/flow.c
index 7938568a9c3..c20da251884 100644
--- a/src/plugins/dpdk/device/flow.c
+++ b/src/plugins/dpdk/device/flow.c
@@ -513,8 +513,6 @@ dpdk_flow_ops_fn (vnet_main_t * vnm, vnet_flow_dev_op_t op, u32 dev_instance,
if (op == VNET_FLOW_DEV_OP_DEL_FLOW)
{
- ASSERT (*private_data >= vec_len (xd->flow_entries));
-
fe = vec_elt_at_index (xd->flow_entries, *private_data);
if ((rv = rte_flow_destroy (xd->device_index, fe->handle,
diff --git a/src/vnet/flow/flow.c b/src/vnet/flow/flow.c
index 4d867fee365..9b6a376af3e 100644
--- a/src/vnet/flow/flow.c
+++ b/src/vnet/flow/flow.c
@@ -96,6 +96,9 @@ vnet_flow_enable (vnet_main_t * vnm, u32 flow_index, u32 hw_if_index)
uword private_data;
int rv;
+ if (f == 0)
+ return VNET_FLOW_ERROR_NO_SUCH_ENTRY;
+
if (!vnet_hw_interface_is_valid (vnm, hw_if_index))
return VNET_FLOW_ERROR_NO_SUCH_INTERFACE;
@@ -137,6 +140,9 @@ vnet_flow_disable (vnet_main_t * vnm, u32 flow_index, u32 hw_if_index)
uword *p;
int rv;
+ if (f == 0)
+ return VNET_FLOW_ERROR_NO_SUCH_ENTRY;
+
if (!vnet_hw_interface_is_valid (vnm, hw_if_index))
return VNET_FLOW_ERROR_NO_SUCH_INTERFACE;