[dpdk-dev] net/i40e: add check for invalid VF queue number

Message ID 1492505180-50780-1-git-send-email-beilei.xing@intel.com (mailing list archive)
State Accepted, archived
Delegated to: Ferruh Yigit
Headers

Checks

Context Check Description
ci/checkpatch success coding style OK
ci/Intel-compilation success Compilation OK

Commit Message

Xing, Beilei April 18, 2017, 8:46 a.m. UTC
  Add check to avoid invalid VF queue number is used in
tunnel filter.

Signed-off-by: Beilei Xing <beilei.xing@intel.com>
---
 drivers/net/i40e/i40e_flow.c | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)
  

Comments

Iremonger, Bernard April 18, 2017, 1:29 p.m. UTC | #1
> -----Original Message-----
> From: dev [mailto:dev-bounces@dpdk.org] On Behalf Of Beilei Xing
> Sent: Tuesday, April 18, 2017 9:46 AM
> To: Wu, Jingjing <jingjing.wu@intel.com>
> Cc: dev@dpdk.org
> Subject: [dpdk-dev] [PATCH] net/i40e: add check for invalid VF queue
> number
> 
> Add check to avoid invalid VF queue number is used in tunnel filter.
> 
> Signed-off-by: Beilei Xing <beilei.xing@intel.com>

Acked-by: Bernard Iremonger <bernard.iremonger@intel.com>
  
Ferruh Yigit April 19, 2017, 10:46 a.m. UTC | #2
On 4/18/2017 2:29 PM, Iremonger, Bernard wrote:
>> -----Original Message-----
>> From: dev [mailto:dev-bounces@dpdk.org] On Behalf Of Beilei Xing
>> Sent: Tuesday, April 18, 2017 9:46 AM
>> To: Wu, Jingjing <jingjing.wu@intel.com>
>> Cc: dev@dpdk.org
>> Subject: [dpdk-dev] [PATCH] net/i40e: add check for invalid VF queue
>> number
>>
>> Add check to avoid invalid VF queue number is used in tunnel filter.
>>
>> Signed-off-by: Beilei Xing <beilei.xing@intel.com>
> 
> Acked-by: Bernard Iremonger <bernard.iremonger@intel.com>

Applied to dpdk-next-net/master, thanks.
  

Patch

diff --git a/drivers/net/i40e/i40e_flow.c b/drivers/net/i40e/i40e_flow.c
index 8fe626c..0a0181f 100644
--- a/drivers/net/i40e/i40e_flow.c
+++ b/drivers/net/i40e/i40e_flow.c
@@ -1234,13 +1234,19 @@  i40e_flow_parse_tunnel_action(struct rte_eth_dev *dev,
 	if (act->type == RTE_FLOW_ACTION_TYPE_QUEUE) {
 		act_q = (const struct rte_flow_action_queue *)act->conf;
 		filter->queue_id = act_q->index;
-		if (!filter->is_to_vf)
-			if (filter->queue_id >= pf->dev_data->nb_rx_queues) {
-				rte_flow_error_set(error, EINVAL,
+		if ((!filter->is_to_vf) &&
+		    (filter->queue_id >= pf->dev_data->nb_rx_queues)) {
+			rte_flow_error_set(error, EINVAL,
 				   RTE_FLOW_ERROR_TYPE_ACTION,
 				   act, "Invalid queue ID for tunnel filter");
-				return -rte_errno;
-			}
+			return -rte_errno;
+		} else if (filter->is_to_vf &&
+			   (filter->queue_id >= pf->vf_nb_qps)) {
+			rte_flow_error_set(error, EINVAL,
+				   RTE_FLOW_ERROR_TYPE_ACTION,
+				   act, "Invalid queue ID for tunnel filter");
+			return -rte_errno;
+		}
 	}
 
 	/* Check if the next non-void item is END */