From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D32BBC7618F for ; Thu, 18 Jul 2019 01:53:39 +0000 (UTC) Received: from dpdk.org (dpdk.org [92.243.14.124]) by mail.kernel.org (Postfix) with ESMTP id 972402173B for ; Thu, 18 Jul 2019 01:53:39 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 972402173B Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=intel.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=dev-bounces@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 736575B3C; Thu, 18 Jul 2019 03:53:30 +0200 (CEST) Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by dpdk.org (Postfix) with ESMTP id D99502BAB; Thu, 18 Jul 2019 03:53:28 +0200 (CEST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga004.jf.intel.com ([10.7.209.38]) by fmsmga105.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 17 Jul 2019 18:53:28 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.64,276,1559545200"; d="scan'208";a="319498125" Received: from npg-dpdk-cvl-yingwang-117d94.sh.intel.com ([10.67.117.94]) by orsmga004.jf.intel.com with ESMTP; 17 Jul 2019 18:53:26 -0700 From: Wang Ying A To: qi.z.zhang@intel.com Cc: qiming.yang@intel.com, dev@dpdk.org, ying.a.wang@intel.com, stable@dpdk.org Date: Thu, 18 Jul 2019 09:38:42 +0800 Message-Id: <1563413923-404004-3-git-send-email-ying.a.wang@intel.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1563413923-404004-1-git-send-email-ying.a.wang@intel.com> References: <1563413923-404004-1-git-send-email-ying.a.wang@intel.com> Subject: [dpdk-dev] [PATCH 2/3] net/ice: fix flow action validation X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" 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@dpdk.org Signed-off-by: Wang Ying A --- 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