[dpdk-stable] patch 'net/nfp: fix memory leak' has been queued to LTS release 18.11.2

[Kevin Traynor]

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 <alejandro.lucero at netronome.com>
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 <alejandro.lucero at netronome.com>
---
 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 at 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);