[dpdk-dev] [PATCH 2/3] net/ice: fix flow action validation

[Ye Xiaolong]

On 07/18, Wang Ying A wrote:
>Action is a list. We should check each element of the action
>rather than the first one.
>This patch fixes this issue.
>
>Fixes: d76116a4678f ("net/ice: add generic flow API")
>Cc: stable at dpdk.org
>
>Signed-off-by: Wang Ying A <ying.a.wang at intel.com>
>---
> drivers/net/ice/ice_generic_flow.c | 39 ++++++++++++++++++++------------------
> 1 file changed, 21 insertions(+), 18 deletions(-)
>
>diff --git a/drivers/net/ice/ice_generic_flow.c b/drivers/net/ice/ice_generic_flow.c
>index 464f6ec..2c57276 100644
>--- a/drivers/net/ice/ice_generic_flow.c
>+++ b/drivers/net/ice/ice_generic_flow.c
>@@ -517,28 +517,31 @@ static int ice_flow_valid_action(struct rte_eth_dev *dev,
> {
> 	const struct rte_flow_action_queue *act_q;
> 	uint16_t queue;
>-
>-	switch (actions->type) {
>-	case RTE_FLOW_ACTION_TYPE_QUEUE:
>-		act_q = actions->conf;
>-		queue = act_q->index;
>-		if (queue >= dev->data->nb_rx_queues) {
>+	const struct rte_flow_action *action;
>+	for (action = actions; action->type !=
>+			RTE_FLOW_ACTION_TYPE_END; action++) {
>+		switch (action->type) {
>+		case RTE_FLOW_ACTION_TYPE_QUEUE:
>+			act_q = action->conf;
>+			queue = act_q->index;
>+			if (queue >= dev->data->nb_rx_queues) {
>+				rte_flow_error_set(error, EINVAL,
>+						RTE_FLOW_ERROR_TYPE_ACTION,
>+						actions, "Invalid queue ID for"
>+						" switch filter.");
>+				return -rte_errno;
>+			}
>+			break;
>+		case RTE_FLOW_ACTION_TYPE_DROP:
>+		case RTE_FLOW_ACTION_TYPE_VOID:
>+			break;
>+		default:
> 			rte_flow_error_set(error, EINVAL,
>-					   RTE_FLOW_ERROR_TYPE_ACTION,
>-					   actions, "Invalid queue ID for"
>-					   " switch filter.");
>+					   RTE_FLOW_ERROR_TYPE_ACTION, actions,
>+					   "Invalid action.");
> 			return -rte_errno;
> 		}
>-		break;
>-	case RTE_FLOW_ACTION_TYPE_DROP:
>-		break;
>-	default:
>-		rte_flow_error_set(error, EINVAL,
>-				   RTE_FLOW_ERROR_TYPE_ACTION, actions,
>-				   "Invalid action.");
>-		return -rte_errno;
> 	}
>-
> 	return 0;
> }
> 
>-- 
>1.8.3.1
>

Reviewed-by: Xiaolong Ye <xiaolong.ye at intel.com>