From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mellanox.co.il (mail-il-dmz.mellanox.com [193.47.165.129]) by dpdk.org (Postfix) with ESMTP id A0D7627D for ; Fri, 8 Mar 2019 18:48:02 +0100 (CET) Received: from Internal Mail-Server by MTLPINE1 (envelope-from yskoh@mellanox.com) with ESMTPS (AES256-SHA encrypted); 8 Mar 2019 19:47:59 +0200 Received: from scfae-sc-2.mti.labs.mlnx (scfae-sc-2.mti.labs.mlnx [10.101.0.96]) by labmailer.mlnx (8.13.8/8.13.8) with ESMTP id x28HloAL002625; Fri, 8 Mar 2019 19:47:58 +0200 From: Yongseok Koh To: Dekel Peled Cc: Shahaf Shuler , dpdk stable Date: Fri, 8 Mar 2019 09:46:43 -0800 Message-Id: <20190308174749.30771-5-yskoh@mellanox.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20190308174749.30771-1-yskoh@mellanox.com> References: <20190308174749.30771-1-yskoh@mellanox.com> Subject: [dpdk-stable] patch 'net/mlx5: fix validation of Rx queue number' has been queued to LTS release 17.11.6 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 08 Mar 2019 17:48:03 -0000 Hi, FYI, your patch has been queued to LTS release 17.11.6 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objection by 03/13/19. So please shout if anyone has objection. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. If the code is different (ie: not only metadata diffs), due for example to a change in context or macro names, please double check it. Thanks. Yongseok --- >>From a9ae6b8107f2cc0a3e353ea5b33deaf6af71c0cc Mon Sep 17 00:00:00 2001 From: Dekel Peled Date: Wed, 28 Nov 2018 11:16:17 +0200 Subject: [PATCH] net/mlx5: fix validation of Rx queue number [ upstream commit 8dd569abad0802f2e5adb0a4ac2483a07555ac89 ] Function mlx5_ctrl_flow_vlan() is used to set the rss rule in MLX5 PMD, using priv->reta_idx_n as number of Rx queues. This number is passed to mlx5_flow_validate_action_rss(), which attempts to access the Rx queues at priv->rxqs. In case priv->rxqs_n is 0, priv->rxqs is empty, and mlx5_flow_validate_action_rss() will crash with segmentation fault. priv->reta_idx_n can never be 0, even if priv->rxqs_n is set to 0. But when priv->rxqs_n is set to 0, setting the rss rule is invalid. This patch updates mlx5_ctrl_flow_vlan(), if priv->rxqs_n is 0 the function will fail with EINVAL errno. Fixes: 8086cf08b2f0 ("net/mlx5: handle RSS hash configuration in RSS flow") Signed-off-by: Dekel Peled Acked-by: Shahaf Shuler --- drivers/net/mlx5/mlx5_flow.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c index 1822c2bdb..4202dd6b0 100644 --- a/drivers/net/mlx5/mlx5_flow.c +++ b/drivers/net/mlx5/mlx5_flow.c @@ -2490,7 +2490,7 @@ mlx5_ctrl_flow_vlan(struct rte_eth_dev *dev, } local; } action_rss; - if (!priv->reta_idx_n) { + if (!priv->reta_idx_n || !priv->rxqs_n) { rte_errno = EINVAL; return -rte_errno; } -- 2.11.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-03-08 09:46:40.661540741 -0800 +++ 0005-net-mlx5-fix-validation-of-Rx-queue-number.patch 2019-03-08 09:46:39.961397000 -0800 @@ -1,8 +1,10 @@ -From 8dd569abad0802f2e5adb0a4ac2483a07555ac89 Mon Sep 17 00:00:00 2001 +From a9ae6b8107f2cc0a3e353ea5b33deaf6af71c0cc Mon Sep 17 00:00:00 2001 From: Dekel Peled Date: Wed, 28 Nov 2018 11:16:17 +0200 Subject: [PATCH] net/mlx5: fix validation of Rx queue number +[ upstream commit 8dd569abad0802f2e5adb0a4ac2483a07555ac89 ] + Function mlx5_ctrl_flow_vlan() is used to set the rss rule in MLX5 PMD, using priv->reta_idx_n as number of Rx queues. This number is passed to mlx5_flow_validate_action_rss(), which @@ -17,7 +19,6 @@ function will fail with EINVAL errno. Fixes: 8086cf08b2f0 ("net/mlx5: handle RSS hash configuration in RSS flow") -Cc: stable@dpdk.org Signed-off-by: Dekel Peled Acked-by: Shahaf Shuler @@ -26,12 +27,12 @@ 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c -index 97dc3e1f8..ee129b97b 100644 +index 1822c2bdb..4202dd6b0 100644 --- a/drivers/net/mlx5/mlx5_flow.c +++ b/drivers/net/mlx5/mlx5_flow.c -@@ -2314,7 +2314,7 @@ mlx5_ctrl_flow_vlan(struct rte_eth_dev *dev, - struct rte_flow_error error; - unsigned int i; +@@ -2490,7 +2490,7 @@ mlx5_ctrl_flow_vlan(struct rte_eth_dev *dev, + } local; + } action_rss; - if (!priv->reta_idx_n) { + if (!priv->reta_idx_n || !priv->rxqs_n) {