d/numam-dpdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ipc: unlock on failure

Browse Source 
Coverity issue: 340076
Fixes: a2a06860b8 ("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>
This commit is contained in:
Aaron Conole 2019-05-06 09:48:25 -04:00 committed by Thomas Monjalon
parent 7e94c8bc7c
commit e377285aba
1 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
lib/librte_eal/common/eal_common_proc.c
View File

@ -934,7 +934,7 @@ int __rte_experimental
rte_mp_request_sync(struct rte_mp_msg *req, struct rte_mp_reply *reply, rte_mp_request_sync(struct rte_mp_msg *req, struct rte_mp_reply *reply,
const struct timespec *ts) const struct timespec *ts)
{ {
int dir_fd, ret = 0; int dir_fd, ret = -1;
DIR *mp_dir; DIR *mp_dir;
struct dirent *ent; struct dirent *ent;
struct timeval now; struct timeval now;
@ -947,7 +947,7 @@ rte_mp_request_sync(struct rte_mp_msg *req, struct rte_mp_reply *reply,
reply->msgs = NULL; reply->msgs = NULL;
if (check_input(req) != 0) if (check_input(req) != 0)
goto err; goto end;
if (internal_config.no_shconf) { if (internal_config.no_shconf) {
RTE_LOG(DEBUG, EAL, "No shared files mode enabled, IPC is disabled\n"); 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) { if (gettimeofday(&now, NULL) < 0) {
RTE_LOG(ERR, EAL, "Failed to get current time\n"); RTE_LOG(ERR, EAL, "Failed to get current time\n");
rte_errno = errno; rte_errno = errno;
goto err; goto end;
} }
end.tv_nsec = (now.tv_usec * 1000 + ts->tv_nsec) % 1000000000; 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); pthread_mutex_lock(&pending_requests.lock);
ret = mp_request_sync(eal_mp_socket_path(), req, reply, &end); ret = mp_request_sync(eal_mp_socket_path(), req, reply, &end);
pthread_mutex_unlock(&pending_requests.lock); pthread_mutex_unlock(&pending_requests.lock);
if (ret) goto end;
goto err;
return ret;
} }
/* for primary process, broadcast request, and collect reply 1 by 1 */ /* 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) { if (!mp_dir) {
RTE_LOG(ERR, EAL, "Unable to open directory %s\n", mp_dir_path); RTE_LOG(ERR, EAL, "Unable to open directory %s\n", mp_dir_path);
rte_errno = errno; rte_errno = errno;
goto err; goto end;
} }
dir_fd = dirfd(mp_dir); 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)) { if (flock(dir_fd, LOCK_SH)) {
RTE_LOG(ERR, EAL, "Unable to lock directory %s\n", RTE_LOG(ERR, EAL, "Unable to lock directory %s\n",
mp_dir_path); mp_dir_path);
closedir(mp_dir);
rte_errno = errno; rte_errno = errno;
goto err; goto close_end;
} }
pthread_mutex_lock(&pending_requests.lock); 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 * locks on receive
*/ */
if (mp_request_sync(path, req, reply, &end)) if (mp_request_sync(path, req, reply, &end))
goto err; goto unlock_end;
} }
ret = 0;
unlock_end:
pthread_mutex_unlock(&pending_requests.lock); pthread_mutex_unlock(&pending_requests.lock);
/* unlock the directory */ /* unlock the directory */
flock(dir_fd, LOCK_UN); flock(dir_fd, LOCK_UN);
close_end:
/* dir_fd automatically closed on closedir */ /* dir_fd automatically closed on closedir */
closedir(mp_dir); closedir(mp_dir);
return ret;
err: end:
free(reply->msgs); if (ret) {
reply->nb_received = 0; free(reply->msgs);
reply->msgs = NULL; reply->nb_received = 0;
return -1; reply->msgs = NULL;
}
return ret;
} }
int __rte_experimental int __rte_experimental