summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAaron Conole <aconole@redhat.com>2019-05-06 09:48:25 -0400
committerThomas Monjalon <thomas@monjalon.net>2019-05-09 16:30:03 +0200
commite377285aba5c4268d5af86852faca3235aab1308 (patch)
tree86291da7273c19334da8a203043c34482c839c07
parent7e94c8bc7cc073922b5d03e9d3c79ee67f7bdd15 (diff)
downloaddpdk-draft-windows-e377285aba5c4268d5af86852faca3235aab1308.zip
dpdk-draft-windows-e377285aba5c4268d5af86852faca3235aab1308.tar.gz
dpdk-draft-windows-e377285aba5c4268d5af86852faca3235aab1308.tar.xz
ipc: unlock on failure
Coverity issue: 340076 Fixes: a2a06860b8c4 ("ipc: fix memory leak on request failure") Cc: stable@dpdk.org Signed-off-by: Aaron Conole <aconole@redhat.com> Reviewed-by: David Marchand <david.marchand@redhat.com> Tested-by: Darek Stojaczyk <dariusz.stojaczyk@intel.com> Acked-by: Anatoly Burakov <anatoly.burakov@intel.com>
-rw-r--r--lib/librte_eal/common/eal_common_proc.c34
1 files 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 d237286..1a2259f 100644
--- a/lib/librte_eal/common/eal_common_proc.c
+++ b/lib/librte_eal/common/eal_common_proc.c
@@ -934,7 +934,7 @@ int __rte_experimental
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;
struct timeval now;
@@ -947,7 +947,7 @@ rte_mp_request_sync(struct rte_mp_msg *req, struct rte_mp_reply *reply,
reply->msgs = NULL;
if (check_input(req) != 0)
- goto err;
+ goto end;
if (internal_config.no_shconf) {
RTE_LOG(DEBUG, EAL, "No shared files mode enabled, IPC is disabled\n");
@@ -957,7 +957,7 @@ rte_mp_request_sync(struct rte_mp_msg *req, struct rte_mp_reply *reply,
if (gettimeofday(&now, NULL) < 0) {
RTE_LOG(ERR, EAL, "Failed to get current time\n");
rte_errno = errno;
- goto err;
+ goto end;
}
end.tv_nsec = (now.tv_usec * 1000 + ts->tv_nsec) % 1000000000;
@@ -969,9 +969,7 @@ rte_mp_request_sync(struct rte_mp_msg *req, struct rte_mp_reply *reply,
pthread_mutex_lock(&pending_requests.lock);
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;
}
/* for primary process, broadcast request, and collect reply 1 by 1 */
@@ -979,7 +977,7 @@ rte_mp_request_sync(struct rte_mp_msg *req, struct rte_mp_reply *reply,
if (!mp_dir) {
RTE_LOG(ERR, EAL, "Unable to open directory %s\n", mp_dir_path);
rte_errno = errno;
- goto err;
+ goto end;
}
dir_fd = dirfd(mp_dir);
@@ -987,9 +985,8 @@ rte_mp_request_sync(struct rte_mp_msg *req, struct rte_mp_reply *reply,
if (flock(dir_fd, LOCK_SH)) {
RTE_LOG(ERR, EAL, "Unable to lock directory %s\n",
mp_dir_path);
- closedir(mp_dir);
rte_errno = errno;
- goto err;
+ goto close_end;
}
pthread_mutex_lock(&pending_requests.lock);
@@ -1006,21 +1003,26 @@ rte_mp_request_sync(struct rte_mp_msg *req, struct rte_mp_reply *reply,
* locks on receive
*/
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);
- return ret;
-err:
- free(reply->msgs);
- reply->nb_received = 0;
- reply->msgs = NULL;
- return -1;
+end:
+ if (ret) {
+ free(reply->msgs);
+ reply->nb_received = 0;
+ reply->msgs = NULL;
+ }
+ return ret;
}
int __rte_experimental