From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by dpdk.space (Postfix) with ESMTP id 09AD4A0679 for ; Tue, 30 Apr 2019 19:02:10 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 01CC858FE; Tue, 30 Apr 2019 19:02:10 +0200 (CEST) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id AE37158FE for ; Tue, 30 Apr 2019 19:02:07 +0200 (CEST) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 1FF5230B9308; Tue, 30 Apr 2019 17:02:07 +0000 (UTC) Received: from rh.redhat.com (ovpn-117-211.ams2.redhat.com [10.36.117.211]) by smtp.corp.redhat.com (Postfix) with ESMTP id 43AE16D0B5; Tue, 30 Apr 2019 17:02:06 +0000 (UTC) From: Kevin Traynor To: Alejandro Lucero Cc: dpdk stable Date: Tue, 30 Apr 2019 18:01:09 +0100 Message-Id: <20190430170133.2331-14-ktraynor@redhat.com> In-Reply-To: <20190430170133.2331-1-ktraynor@redhat.com> References: <20190430170133.2331-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.49]); Tue, 30 Apr 2019 17:02:07 +0000 (UTC) Subject: [dpdk-stable] patch 'net/nfp: fix memory leak' has been queued to LTS release 18.11.2 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: , Errors-To: stable-bounces@dpdk.org Sender: "stable" Hi, FYI, your patch has been queued to LTS release 18.11.2 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 05/07/19. 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 can be viewed on a temporary branch at: https://github.com/kevintraynor/dpdk-stable-queue.git Thanks. Kevin Traynor --- >From e2b9a9571112f2a742a66be287d3b6c86ec0759e Mon Sep 17 00:00:00 2001 From: Alejandro Lucero Date: Mon, 8 Apr 2019 11:19:29 +0100 Subject: [PATCH] net/nfp: fix memory leak [ upstream commit 318e737d2d04899733539c63aab84bf0b2cf0552 ] If errors, release the allocated structure. Coverity issue: 277222 Fixes: c7e9729da6b5 ("net/nfp: support CPP") Signed-off-by: Alejandro Lucero --- drivers/net/nfp/nfpcore/nfp_cpp_pcie_ops.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/drivers/net/nfp/nfpcore/nfp_cpp_pcie_ops.c b/drivers/net/nfp/nfpcore/nfp_cpp_pcie_ops.c index 6dfa3e302..37b7991f0 100644 --- a/drivers/net/nfp/nfpcore/nfp_cpp_pcie_ops.c +++ b/drivers/net/nfp/nfpcore/nfp_cpp_pcie_ops.c @@ -791,15 +791,15 @@ nfp6000_init(struct nfp_cpp *cpp, struct rte_pci_device *dev) ret = nfp_acquire_process_lock(desc); if (ret) - return -1; + goto error; } if (nfp6000_set_model(dev, cpp) < 0) - return -1; + goto error; if (nfp6000_set_interface(dev, cpp) < 0) - return -1; + goto error; if (nfp6000_set_serial(dev, cpp) < 0) - return -1; + goto error; if (nfp6000_set_barsz(dev, desc) < 0) - return -1; + goto error; desc->cfg = (char *)dev->mem_resource[0].addr; @@ -812,5 +812,9 @@ nfp6000_init(struct nfp_cpp *cpp, struct rte_pci_device *dev) nfp_cpp_model_set(cpp, model); - return ret; + return 0; + +error: + free(desc); + return -1; } -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-04-30 17:58:14.484636993 +0100 +++ 0014-net-nfp-fix-memory-leak.patch 2019-04-30 17:58:13.775140435 +0100 @@ -1 +1 @@ -From 318e737d2d04899733539c63aab84bf0b2cf0552 Mon Sep 17 00:00:00 2001 +From e2b9a9571112f2a742a66be287d3b6c86ec0759e Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 318e737d2d04899733539c63aab84bf0b2cf0552 ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -14,2 +15,2 @@ - drivers/net/nfp/nfpcore/nfp_cpp_pcie_ops.c | 18 +++++++++++------- - 1 file changed, 11 insertions(+), 7 deletions(-) + drivers/net/nfp/nfpcore/nfp_cpp_pcie_ops.c | 16 ++++++++++------ + 1 file changed, 10 insertions(+), 6 deletions(-) @@ -18 +19 @@ -index 93ee310f5..33baa989b 100644 +index 6dfa3e302..37b7991f0 100644 @@ -21 +22 @@ -@@ -866,5 +866,5 @@ nfp6000_init(struct nfp_cpp *cpp, struct rte_pci_device *dev) +@@ -791,15 +791,15 @@ nfp6000_init(struct nfp_cpp *cpp, struct rte_pci_device *dev) @@ -28,7 +28,0 @@ -@@ -873,15 +873,15 @@ nfp6000_init(struct nfp_cpp *cpp, struct rte_pci_device *dev) - ret = nfp_acquire_secondary_process_lock(desc); - if (ret) -- return -1; -+ goto error; - } - @@ -49,2 +43,2 @@ -@@ -891,5 +891,9 @@ nfp6000_init(struct nfp_cpp *cpp, struct rte_pci_device *dev) - nfp_cpp_priv_set(cpp, desc); +@@ -812,5 +812,9 @@ nfp6000_init(struct nfp_cpp *cpp, struct rte_pci_device *dev) + nfp_cpp_model_set(cpp, model);