net/ice: add action number check for switch
authorWei Zhao <wei.zhao1@intel.com>
Fri, 3 Apr 2020 04:46:02 +0000 (12:46 +0800)
committerFerruh Yigit <ferruh.yigit@intel.com>
Tue, 21 Apr 2020 11:57:06 +0000 (13:57 +0200)
The action number can only be one for DCF or PF
switch filter, not support multiple actions.

Fixes: 47d460d63233 ("net/ice: rework switch filter")
Cc: stable@dpdk.org
Signed-off-by: Wei Zhao <wei.zhao1@intel.com>
Acked-by: Qi Zhang <qi.z.zhang@intel.com>
drivers/net/ice/ice_switch_filter.c

index d9bdf96..cc48f22 100644 (file)
@@ -1073,6 +1073,46 @@ error:
        return -rte_errno;
 }
 
+static int
+ice_switch_check_action(const struct rte_flow_action *actions,
+                           struct rte_flow_error *error)
+{
+       const struct rte_flow_action *action;
+       enum rte_flow_action_type action_type;
+       uint16_t actions_num = 0;
+
+       for (action = actions; action->type !=
+                               RTE_FLOW_ACTION_TYPE_END; action++) {
+               action_type = action->type;
+               switch (action_type) {
+               case RTE_FLOW_ACTION_TYPE_VF:
+               case RTE_FLOW_ACTION_TYPE_RSS:
+               case RTE_FLOW_ACTION_TYPE_QUEUE:
+               case RTE_FLOW_ACTION_TYPE_DROP:
+                       actions_num++;
+                       break;
+               case RTE_FLOW_ACTION_TYPE_VOID:
+                       continue;
+               default:
+                       rte_flow_error_set(error,
+                                          EINVAL, RTE_FLOW_ERROR_TYPE_ACTION,
+                                          actions,
+                                          "Invalid action type");
+                       return -rte_errno;
+               }
+       }
+
+       if (actions_num > 1) {
+               rte_flow_error_set(error,
+                                  EINVAL, RTE_FLOW_ERROR_TYPE_ACTION,
+                                  actions,
+                                  "Invalid action number");
+               return -rte_errno;
+       }
+
+       return 0;
+}
+
 static int
 ice_switch_parse_pattern_action(struct ice_adapter *ad,
                struct ice_pattern_match_item *array,
@@ -1158,6 +1198,14 @@ ice_switch_parse_pattern_action(struct ice_adapter *ad,
                goto error;
        }
 
+       ret = ice_switch_check_action(actions, error);
+       if (ret) {
+               rte_flow_error_set(error, EINVAL,
+                                  RTE_FLOW_ERROR_TYPE_HANDLE, NULL,
+                                  "Invalid input action number");
+               goto error;
+       }
+
        if (ad->hw.dcf_enabled)
                ret = ice_switch_parse_dcf_action(actions, error, &rule_info);
        else