Fix: worker structure is leaked in run_as process

[lttng-tools.git] / src / common / runas.c

diff --git a/src/common/runas.c b/src/common/runas.c
index 33462958f2e4b85b66976495b17873c2ce71ef1a..4fc229b0d0317452df0b3db08c78ab4c998a97d3 100644 (file)
--- a/src/common/runas.c
+++ b/src/common/runas.c
@@ -218,7 +218,7 @@ int _open(struct run_as_data *data, struct run_as_ret *ret_value)
        ret_value->u.open.ret = open(data->u.open.path, data->u.open.flags, data->u.open.mode);
        ret_value->fd = ret_value->u.open.ret;
        ret_value->_errno = errno;
-       ret_value->_error = (ret_value->u.open.ret) ? true : false;
+       ret_value->_error = ret_value->u.open.ret < 0;
        return ret_value->u.open.ret;
 }
 
@@ -877,7 +877,7 @@ int run_as_create_worker_no_lock(const char *procname)
        worker->procname = strdup(procname);
        if (!worker->procname) {
                ret = -ENOMEM;
-               goto end;
+               goto error_procname_alloc;
        }
        /* Create unix socket. */
        if (lttcomm_create_anon_unix_socketpair(worker->sockpair) < 0) {
@@ -921,6 +921,8 @@ int run_as_create_worker_no_lock(const char *procname)
                        ret = -1;
                }
                worker->sockpair[1] = -1;
+               free(worker->procname);
+               free(worker);
                LOG(ret ? PRINT_ERR : PRINT_DBG, "run_as worker exiting (ret = %d)", ret);
                exit(ret ? EXIT_FAILURE : EXIT_SUCCESS);
        } else {
@@ -960,6 +962,8 @@ error_fork:
                worker->sockpair[i] = -1;
        }
 error_sock:
+       free(worker->procname);
+error_procname_alloc:
        free(worker);
        return ret;
 }