From patchwork Wed Nov 4 14:25:19 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dekel Peled X-Patchwork-Id: 83685 X-Patchwork-Delegate: rasland@nvidia.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 9E5FFA04B1; Wed, 4 Nov 2020 15:25:33 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 01823C92E; Wed, 4 Nov 2020 15:25:32 +0100 (CET) Received: from mellanox.co.il (mail-il-dmz.mellanox.com [193.47.165.129]) by dpdk.org (Postfix) with ESMTP id E5AAAC92A for ; Wed, 4 Nov 2020 15:25:29 +0100 (CET) Received: from Internal Mail-Server by MTLPINE1 (envelope-from dekelp@nvidia.com) with SMTP; 4 Nov 2020 16:25:24 +0200 Received: from mtl-vdi-280.wap.labs.mlnx. (mtl-vdi-280.wap.labs.mlnx [10.228.134.250]) by labmailer.mlnx (8.13.8/8.13.8) with ESMTP id 0A4EPO3u010027; Wed, 4 Nov 2020 16:25:24 +0200 From: Dekel Peled To: viacheslavo@nvidia.com, shahafs@nvidia.com, matan@nvidia.com Cc: dev@dpdk.org Date: Wed, 4 Nov 2020 16:25:19 +0200 Message-Id: X-Mailer: git-send-email 1.7.1 Subject: [dpdk-dev] [PATCH] net/mlx5: fix use of local array for global error 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" Recent patch uses a local string array as input for function rte_flow_error_set(). This stack memory may be later used by other code sections, overwriting the desired error string. This patch impelemnets an error string for the specific case requested, of ICMP item not supported in Verbs flow engine. Fixes: cb6a02dcea9d ("net/mlx5: support item type error message in flow Verbs") Signed-off-by: Dekel Peled Acked-by: Matan Azrad --- drivers/net/mlx5/mlx5_flow_verbs.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/net/mlx5/mlx5_flow_verbs.c b/drivers/net/mlx5/mlx5_flow_verbs.c index 28fd120..04f6b40 100644 --- a/drivers/net/mlx5/mlx5_flow_verbs.c +++ b/drivers/net/mlx5/mlx5_flow_verbs.c @@ -1247,7 +1247,6 @@ uint64_t last_item = 0; uint8_t next_protocol = 0xff; uint16_t ether_type = 0; - char errstr[32]; if (items == NULL) return -1; @@ -1398,12 +1397,16 @@ return ret; last_item = MLX5_FLOW_LAYER_MPLS; break; + case RTE_FLOW_ITEM_TYPE_ICMP: + case RTE_FLOW_ITEM_TYPE_ICMP6: + return rte_flow_error_set(error, ENOTSUP, + RTE_FLOW_ERROR_TYPE_ITEM, + NULL, "ICMP/ICMP6 " + "item not supported"); default: - snprintf(errstr, sizeof(errstr), "item type %d not supported", - items->type); return rte_flow_error_set(error, ENOTSUP, RTE_FLOW_ERROR_TYPE_ITEM, - NULL, errstr); + NULL, "item not supported"); } item_flags |= last_item; } @@ -1698,7 +1701,6 @@ struct mlx5_priv *priv = dev->data->dev_private; struct mlx5_flow_workspace *wks = mlx5_flow_get_thread_workspace(); struct mlx5_flow_rss_desc *rss_desc; - char errstr[32]; MLX5_ASSERT(wks); rss_desc = &wks->rss_desc[!!wks->flow_nested_idx]; @@ -1846,11 +1848,9 @@ item_flags |= MLX5_FLOW_LAYER_MPLS; break; default: - snprintf(errstr, sizeof(errstr), "item type %d not supported", - items->type); return rte_flow_error_set(error, ENOTSUP, RTE_FLOW_ERROR_TYPE_ITEM, - NULL, errstr); + NULL, "item not supported"); } } dev_flow->handle->layers = item_flags;