From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id D1A6746364 for ; Fri, 7 Mar 2025 13:25:25 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id C70254029E; Fri, 7 Mar 2025 13:25:25 +0100 (CET) Received: from mail-wr1-f54.google.com (mail-wr1-f54.google.com [209.85.221.54]) by mails.dpdk.org (Postfix) with ESMTP id 46EC24029E for ; Fri, 7 Mar 2025 13:25:24 +0100 (CET) Received: by mail-wr1-f54.google.com with SMTP id ffacd0b85a97d-391342fc1f6so654104f8f.1 for ; Fri, 07 Mar 2025 04:25:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1741350324; x=1741955124; darn=dpdk.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=uvOCcRqpssrDmhDL/+Qqla+EXaE2Jui5yQVtd3v/LSE=; b=g3zfP+jumJeiQ2RldG/Wc+JimQO7G5JjFGbylI4oTd6MZ4PX3ynnZGOQF4PN665dyy mW3td848Mwanx4EVE1KI17ShN2+qQf3n4S5HlejRvLqVAo/ZG/AbHubfjLrgK3lxDl9q STVRLZ1vYtMByLGZ3ul/gU0lv/hhauWSAn+Jd3jMpSUUzKNb/LhQG1CJsIc0UcoLEcyr KWXTz57HnyNP/ZHyJldSjV8iWDDNqT26hwzpyJCmLD3PhxaIMyB5D3FRBE8IQfAPy33u JsTpKpYIvHEEpCYCWiRwKt3oLKbO6RYPtLFxy5HJy+AIUPiFqL4USHuzJE5UZ/4pDirl TmDQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741350324; x=1741955124; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=uvOCcRqpssrDmhDL/+Qqla+EXaE2Jui5yQVtd3v/LSE=; b=s+8nYnzBeyLwN2P2Y6l/SlmJXpywsMw/18mVGY87ItflZ3g1UeCjI/5RczmyVlfHGg zuV6GEDu6Ml1IyhsEtK+52tiKny74arT42VDGHZXDeeQJOo9+I/VWatVscelD0hMrBTJ +bJ0whimtbnLO4uhJQotp80GYwp/cNidh9ulk7kfeLRteHPgGePDwTa/5mQqdGxCYh5W q560p+7KFtxEtZYKktsbijj/0HB7Q37U4AXVjxhGfJz2PQXElrEiUDfzyDoFtNF9Z3wc 5vmDQOIj96blVwimTNbFxVVMSN179bjNBfbi4R5/7tuDjfwC5wblHS3hoKuhS+Pnp+Zk 4Mbw== X-Forwarded-Encrypted: i=1; AJvYcCXY8IJl3It0aR4JUtv6GTsenD43v3SwDhH58mPca4tX1AtT+gFlag1/wNxD2Mxi3feoAY4y/sk=@dpdk.org X-Gm-Message-State: AOJu0YxUiHhMOLytXCwPB4DOfUltQ5izTT9aF/jmTkjD8F3PgaYaEqcr JeYvji9/fu/4Lr6RE86GZmh4qyH7xITOW7B+d1V6YJLu0r0mRtQ04fz/4/I1 X-Gm-Gg: ASbGnctqwIdqkeZJZQzktQoh3ntqQnpqjPsK+akc+/Zz9bhT4WylvDimVwXVtoeOf5W 8OZ5uOPmJhZBP1gfdQdyh/j89On1yBBhpqeophmt5rufHCTYoyPKo/oYQo5poWCEZWbvqzvBQ5Z ZmTts0FG6UixMj1M0m6IzEB5r04FWVU+GuQAuFcyXcVyeUT70Z4hG2u2LSJIcjO+/EoDrxRGbH/ +L8mA0jwVXJvssxebg7Qm9OshzTxDELFrRbTnSTwB4YON87yvNsJHHiNTYGri3EiQ8akySaF67o z8GaZ0WklkEFWxh+uPD723oG8A0l+wZSbUAFvHrrxNxaCCdHHrU= X-Google-Smtp-Source: AGHT+IEleA3vLboUxLeKl3EOLkPq+M/YrVdClbxNgY+VAtUUB4HHeTPmFU5xtTA8/4wRi6SPu1/32A== X-Received: by 2002:a05:6000:188c:b0:38f:2413:2622 with SMTP id ffacd0b85a97d-39132db9064mr1749413f8f.47.1741350323641; Fri, 07 Mar 2025 04:25:23 -0800 (PST) Received: from localhost ([2a01:4b00:d036:ae00:ff31:f049:bd38:f7cf]) by smtp.gmail.com with UTF8SMTPSA id ffacd0b85a97d-3912c015d1csm5115007f8f.44.2025.03.07.04.25.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Mar 2025 04:25:23 -0800 (PST) From: luca.boccassi@gmail.com To: David Marchand Cc: Dariusz Sosnowski , dpdk stable Subject: patch 'net/mlx5: fix leak in HWS flow counter action' has been queued to stable release 22.11.8 Date: Fri, 7 Mar 2025 12:24:15 +0000 Message-ID: <20250307122431.1415551-16-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250307122431.1415551-1-luca.boccassi@gmail.com> References: <20250217170456.1068278-79-luca.boccassi@gmail.com> <20250307122431.1415551-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Hi, FYI, your patch has been queued to stable release 22.11.8 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 03/09/25. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/d653878d18bd406c2b7b983cb09121e68894b645 Thanks. Luca Boccassi --- >From d653878d18bd406c2b7b983cb09121e68894b645 Mon Sep 17 00:00:00 2001 From: David Marchand Date: Mon, 27 Jan 2025 11:53:47 +0100 Subject: [PATCH] net/mlx5: fix leak in HWS flow counter action [ upstream commit 9e34fcc81c005a60c919c572ef83c10ebb0201af ] This was caught by our internal covscan. mp_name can be leaked in case of errors. Fixes: 4d368e1da3a4 ("net/mlx5: support flow counter action for HWS") Signed-off-by: David Marchand Acked-by: Dariusz Sosnowski --- drivers/net/mlx5/mlx5_hws_cnt.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/net/mlx5/mlx5_hws_cnt.c b/drivers/net/mlx5/mlx5_hws_cnt.c index 3250255727..cec0710efe 100644 --- a/drivers/net/mlx5/mlx5_hws_cnt.c +++ b/drivers/net/mlx5/mlx5_hws_cnt.c @@ -658,7 +658,7 @@ mlx5_hws_cnt_pool_create(struct rte_eth_dev *dev, struct mlx5_priv *priv = dev->data->dev_private; struct mlx5_hws_cache_param cparam = {0}; struct mlx5_hws_cnt_pool_cfg pcfg = {0}; - char *mp_name; + char *mp_name = NULL; int ret = 0; size_t sz; @@ -666,7 +666,7 @@ mlx5_hws_cnt_pool_create(struct rte_eth_dev *dev, if (priv->sh->cnt_svc == NULL) { ret = mlx5_hws_cnt_svc_init(priv->sh); if (ret != 0) - return NULL; + goto error; } cparam.fetch_sz = HWS_CNT_CACHE_FETCH_DEFAULT; cparam.preload_sz = HWS_CNT_CACHE_PRELOAD_DEFAULT; @@ -711,6 +711,7 @@ mlx5_hws_cnt_pool_create(struct rte_eth_dev *dev, return cpool; error: mlx5_hws_cnt_pool_destroy(priv->sh, cpool); + mlx5_free(mp_name); return NULL; } -- 2.47.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-03-07 12:23:38.613481872 +0000 +++ 0016-net-mlx5-fix-leak-in-HWS-flow-counter-action.patch 2025-03-07 12:23:38.014838527 +0000 @@ -1 +1 @@ -From 9e34fcc81c005a60c919c572ef83c10ebb0201af Mon Sep 17 00:00:00 2001 +From d653878d18bd406c2b7b983cb09121e68894b645 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 9e34fcc81c005a60c919c572ef83c10ebb0201af ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -15,2 +16,2 @@ - drivers/net/mlx5/mlx5_hws_cnt.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) + drivers/net/mlx5/mlx5_hws_cnt.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) @@ -19 +20 @@ -index 0197c098f6..eaceedd5ba 100644 +index 3250255727..cec0710efe 100644 @@ -22 +23,10 @@ -@@ -723,7 +723,7 @@ mlx5_hws_cnt_pool_create(struct rte_eth_dev *dev, +@@ -658,7 +658,7 @@ mlx5_hws_cnt_pool_create(struct rte_eth_dev *dev, + struct mlx5_priv *priv = dev->data->dev_private; + struct mlx5_hws_cache_param cparam = {0}; + struct mlx5_hws_cnt_pool_cfg pcfg = {0}; +- char *mp_name; ++ char *mp_name = NULL; + int ret = 0; + size_t sz; + +@@ -666,7 +666,7 @@ mlx5_hws_cnt_pool_create(struct rte_eth_dev *dev, @@ -24,3 +34,3 @@ - ret = mlx5_hws_cnt_svc_init(priv->sh, error); - if (ret) -- return ret; + ret = mlx5_hws_cnt_svc_init(priv->sh); + if (ret != 0) +- return NULL; @@ -31,2 +41,3 @@ -@@ -767,6 +767,7 @@ error: - MLX5_ASSERT(ret); +@@ -711,6 +711,7 @@ mlx5_hws_cnt_pool_create(struct rte_eth_dev *dev, + return cpool; + error: @@ -34 +44,0 @@ - priv->hws_cpool = NULL; @@ -36 +46 @@ - return ret; + return NULL;