[dpdk-stable] patch 'net/pcap: 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 04/16/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.

Thanks.

Kevin Traynor

---
>From b50c01307b4e113946661930ef8f4dd4e24414b1 Mon Sep 17 00:00:00 2001
From: Qi Zhang <qi.z.zhang at intel.com>
Date: Wed, 30 Jan 2019 09:08:54 +0800
Subject: [PATCH] net/pcap: fix memory leak

[ upstream commit 9b3d42207c35516b1c62fbdf19da288e5c3d8356 ]

Fix potential memory leak due to kvlist not be freed.

Fixes: 0d0dd2d9d8ff ("net/pcap: enable data path for secondary process")

Reported-by: Gage Eads <gage.eads at intel.com>
Signed-off-by: Qi Zhang <qi.z.zhang at intel.com>
Acked-by: Ferruh Yigit <ferruh.yigit at intel.com>
---
 drivers/net/pcap/rte_eth_pcap.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/net/pcap/rte_eth_pcap.c b/drivers/net/pcap/rte_eth_pcap.c
index 9fd932772..65bbd7e2f 100644
--- a/drivers/net/pcap/rte_eth_pcap.c
+++ b/drivers/net/pcap/rte_eth_pcap.c
@@ -1259,5 +1259,6 @@ create_eth:
 			PMD_LOG(ERR,
 				"Failed to allocate memory for process private");
-			return -1;
+			ret = -1;
+			goto free_kvlist;
 		}
 
@@ -1282,5 +1283,5 @@ create_eth:
 
 		rte_eth_dev_probing_finish(eth_dev);
-		return 0;
+		goto free_kvlist;
 	}
 
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-04-10 14:06:08.096489274 +0100
+++ 0001-net-pcap-fix-memory-leak.patch	2019-04-10 14:06:07.744296991 +0100
@@ -1,12 +1,13 @@
-From 9b3d42207c35516b1c62fbdf19da288e5c3d8356 Mon Sep 17 00:00:00 2001
+From b50c01307b4e113946661930ef8f4dd4e24414b1 Mon Sep 17 00:00:00 2001
 From: Qi Zhang <qi.z.zhang at intel.com>
 Date: Wed, 30 Jan 2019 09:08:54 +0800
 Subject: [PATCH] net/pcap: fix memory leak
 
+[ upstream commit 9b3d42207c35516b1c62fbdf19da288e5c3d8356 ]
+
 Fix potential memory leak due to kvlist not be freed.
 
 Fixes: 0d0dd2d9d8ff ("net/pcap: enable data path for secondary process")
-Cc: stable at dpdk.org
 
 Reported-by: Gage Eads <gage.eads at intel.com>
 Signed-off-by: Qi Zhang <qi.z.zhang at intel.com>