[dpdk-stable] patch 'ipc: unlock on failure' 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/20/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 are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/4bd4eac2b748c1daadf9172d9b2566dfed55ee9e

Thanks.

Kevin Traynor

---
>From 4bd4eac2b748c1daadf9172d9b2566dfed55ee9e Mon Sep 17 00:00:00 2001
From: Aaron Conole <aconole at redhat.com>
Date: Mon, 6 May 2019 09:48:25 -0400
Subject: [PATCH] ipc: unlock on failure

[ upstream commit e377285aba5c4268d5af86852faca3235aab1308 ]

Coverity issue: 340076
Fixes: a2a06860b8c4 ("ipc: fix memory leak on request failure")

Signed-off-by: Aaron Conole <aconole at redhat.com>
Reviewed-by: David Marchand <david.marchand at redhat.com>
Tested-by: Darek Stojaczyk <dariusz.stojaczyk at intel.com>
Acked-by: Anatoly Burakov <anatoly.burakov at intel.com>
---
 lib/librte_eal/common/eal_common_proc.c | 34 +++++++++++++------------
 1 file changed, 18 insertions(+), 16 deletions(-)

diff --git a/lib/librte_eal/common/eal_common_proc.c b/lib/librte_eal/common/eal_common_proc.c
index d098803b1..852e52e02 100644
--- a/lib/librte_eal/common/eal_common_proc.c
+++ b/lib/librte_eal/common/eal_common_proc.c
@@ -935,5 +935,5 @@ rte_mp_request_sync(struct rte_mp_msg *req, struct rte_mp_reply *reply,
 		const struct timespec *ts)
 {
-	int dir_fd, ret = 0;
+	int dir_fd, ret = -1;
 	DIR *mp_dir;
 	struct dirent *ent;
@@ -948,5 +948,5 @@ rte_mp_request_sync(struct rte_mp_msg *req, struct rte_mp_reply *reply,
 
 	if (check_input(req) == false)
-		goto err;
+		goto end;
 
 	if (internal_config.no_shconf) {
@@ -958,5 +958,5 @@ rte_mp_request_sync(struct rte_mp_msg *req, struct rte_mp_reply *reply,
 		RTE_LOG(ERR, EAL, "Failed to get current time\n");
 		rte_errno = errno;
-		goto err;
+		goto end;
 	}
 
@@ -970,7 +970,5 @@ rte_mp_request_sync(struct rte_mp_msg *req, struct rte_mp_reply *reply,
 		ret = mp_request_sync(eal_mp_socket_path(), req, reply, &end);
 		pthread_mutex_unlock(&pending_requests.lock);
-		if (ret)
-			goto err;
-		return ret;
+		goto end;
 	}
 
@@ -980,5 +978,5 @@ rte_mp_request_sync(struct rte_mp_msg *req, struct rte_mp_reply *reply,
 		RTE_LOG(ERR, EAL, "Unable to open directory %s\n", mp_dir_path);
 		rte_errno = errno;
-		goto err;
+		goto end;
 	}
 
@@ -988,7 +986,6 @@ rte_mp_request_sync(struct rte_mp_msg *req, struct rte_mp_reply *reply,
 		RTE_LOG(ERR, EAL, "Unable to lock directory %s\n",
 			mp_dir_path);
-		closedir(mp_dir);
 		rte_errno = errno;
-		goto err;
+		goto close_end;
 	}
 
@@ -1007,19 +1004,24 @@ rte_mp_request_sync(struct rte_mp_msg *req, struct rte_mp_reply *reply,
 		 */
 		if (mp_request_sync(path, req, reply, &end))
-			goto err;
+			goto unlock_end;
 	}
+	ret = 0;
+
+unlock_end:
 	pthread_mutex_unlock(&pending_requests.lock);
 	/* unlock the directory */
 	flock(dir_fd, LOCK_UN);
 
+close_end:
 	/* dir_fd automatically closed on closedir */
 	closedir(mp_dir);
+
+end:
+	if (ret) {
+		free(reply->msgs);
+		reply->nb_received = 0;
+		reply->msgs = NULL;
+	}
 	return ret;
-
-err:
-	free(reply->msgs);
-	reply->nb_received = 0;
-	reply->msgs = NULL;
-	return -1;
 }
 
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-05-14 15:39:07.508150634 +0100
+++ 0004-ipc-unlock-on-failure.patch	2019-05-14 15:39:07.299559091 +0100
@@ -1 +1 @@
-From e377285aba5c4268d5af86852faca3235aab1308 Mon Sep 17 00:00:00 2001
+From 4bd4eac2b748c1daadf9172d9b2566dfed55ee9e Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit e377285aba5c4268d5af86852faca3235aab1308 ]
+
@@ -8 +9,0 @@
-Cc: stable at dpdk.org
@@ -19 +20 @@
-index d23728604..1a2259fe3 100644
+index d098803b1..852e52e02 100644
@@ -31 +32 @@
- 	if (check_input(req) != 0)
+ 	if (check_input(req) == false)