[v2] ipc: unlock on failure
diff mbox series

Message ID 20190506134825.20706-1-aconole@redhat.com
State Accepted, archived
Delegated to: Thomas Monjalon
Headers show
Series
  • [v2] ipc: unlock on failure
Related show

Checks

Context Check Description
ci/checkpatch success coding style OK
ci/Intel-compilation success Compilation OK
ci/mellanox-Performance-Testing success Performance Testing PASS
ci/intel-Performance-Testing success Performance Testing PASS

Commit Message

Aaron Conole May 6, 2019, 1:48 p.m. UTC
Reported by Coverity.

Fixes: a2a06860b8c4 ("ipc: fix memory leak on request failure")
Cc: Herakliusz Lipiec <herakliusz.lipiec@intel.com>
Cc: stable@dpdk.org
Cc: Anatoly Burakov <anatoly.burakov@intel.com>
Signed-off-by: Aaron Conole <aconole@redhat.com>
---
 lib/librte_eal/common/eal_common_proc.c | 34 +++++++++++++------------
 1 file changed, 18 insertions(+), 16 deletions(-)

Comments

David Marchand May 6, 2019, 2:02 p.m. UTC | #1
On Mon, May 6, 2019 at 3:48 PM Aaron Conole <aconole@redhat.com> wrote:

> Reported by Coverity.
>
>
Coverity issue: 340076

Fixes: a2a06860b8c4 ("ipc: fix memory leak on request failure")
> Cc: Herakliusz Lipiec <herakliusz.lipiec@intel.com>
> Cc: stable@dpdk.org
> Cc: Anatoly Burakov <anatoly.burakov@intel.com>
> Signed-off-by: Aaron Conole <aconole@redhat.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 d23728604..1a2259fe3 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
> --
> 2.19.1
>


LGTM.
Reviewed-by: David Marchand <david.marchand@redhat.com>
Stojaczyk, Dariusz May 8, 2019, 2:24 p.m. UTC | #2
> -----Original Message-----
> From: dev [mailto:dev-bounces@dpdk.org] On Behalf Of Aaron Conole
> Sent: Monday, May 6, 2019 3:48 PM
> To: dev@dpdk.org
> Cc: Lipiec, Herakliusz <herakliusz.lipiec@intel.com>; stable@dpdk.org;
> Burakov, Anatoly <anatoly.burakov@intel.com>; David Marchand
> <dmarchan@redhat.com>
> Subject: [dpdk-dev] [PATCH v2] ipc: unlock on failure
> 
> Reported by Coverity.
> 
> Fixes: a2a06860b8c4 ("ipc: fix memory leak on request failure")
> Cc: Herakliusz Lipiec <herakliusz.lipiec@intel.com>
> Cc: stable@dpdk.org
> Cc: Anatoly Burakov <anatoly.burakov@intel.com>
> Signed-off-by: Aaron Conole <aconole@redhat.com>
> ---

Tested-by: Darek Stojaczyk <dariusz.stojaczyk@intel.com>

This silences ASAN as well. :)

Thanks,
D.
Burakov, Anatoly May 9, 2019, 11:50 a.m. UTC | #3
On 06-May-19 2:48 PM, Aaron Conole wrote:
> Reported by Coverity.

Maybe have a more descriptive commit message?

> 
> Fixes: a2a06860b8c4 ("ipc: fix memory leak on request failure")
> Cc: Herakliusz Lipiec <herakliusz.lipiec@intel.com>
> Cc: stable@dpdk.org
> Cc: Anatoly Burakov <anatoly.burakov@intel.com>
> Signed-off-by: Aaron Conole <aconole@redhat.com>
> ---

Acked-by: Anatoly Burakov <anatoly.burakov@intel.com>
Thomas Monjalon May 9, 2019, 2:31 p.m. UTC | #4
09/05/2019 13:50, Burakov, Anatoly:
> On 06-May-19 2:48 PM, Aaron Conole wrote:
> > Reported by Coverity.
> 
> Maybe have a more descriptive commit message?
> 
> > 
> > Fixes: a2a06860b8c4 ("ipc: fix memory leak on request failure")
> > Cc: Herakliusz Lipiec <herakliusz.lipiec@intel.com>
> > Cc: stable@dpdk.org
> > Cc: Anatoly Burakov <anatoly.burakov@intel.com>
> > Signed-off-by: Aaron Conole <aconole@redhat.com>
> > ---
> 
> Acked-by: Anatoly Burakov <anatoly.burakov@intel.com>

Applied, thanks

Patch
diff mbox series

diff --git a/lib/librte_eal/common/eal_common_proc.c b/lib/librte_eal/common/eal_common_proc.c
index d23728604..1a2259fe3 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