Fix: lttng: uninitialized pointer free'd when no sessiond is present

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

diff --git a/src/common/utils.c b/src/common/utils.c
index b0e5b63e34400c3f0e2e2df57b58fcdf0f875f32..d9bacad0e7a7f32dd660e2d6db28b754b7545066 100644 (file)
--- a/src/common/utils.c
+++ b/src/common/utils.c
@@ -1,20 +1,10 @@
 /*
- * Copyright (C) 2012 - David Goulet <dgoulet@efficios.com>
- * Copyright (C) 2013 - Raphaël Beamonte <raphael.beamonte@gmail.com>
- * Copyright (C) 2013 - Jérémie Galarneau <jeremie.galarneau@efficios.com>
+ * Copyright (C) 2012 David Goulet <dgoulet@efficios.com>
+ * Copyright (C) 2013 Raphaël Beamonte <raphael.beamonte@gmail.com>
+ * Copyright (C) 2013 Jérémie Galarneau <jeremie.galarneau@efficios.com>
  *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License, version 2 only, as
- * published by the Free Software Foundation.
+ * SPDX-License-Identifier: GPL-2.0-only
  *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc., 51
- * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 #define _LGPL_SOURCE
@@ -324,7 +314,7 @@ error:
  * The returned string was allocated in the function, it is thus of
  * the responsibility of the caller to free this memory.
  */
-LTTNG_HIDDEN
+static
 char *_utils_expand_path(const char *path, bool keep_symlink)
 {
        int ret;
@@ -379,6 +369,9 @@ char *_utils_expand_path(const char *path, bool keep_symlink)
                /* Resolve partially our path */
                absolute_path = utils_partial_realpath(absolute_path,
                                absolute_path, LTTNG_PATH_MAX);
+               if (!absolute_path) {
+                       goto error;
+               }
        }
 
        ret = expand_double_slashes_dot_and_dotdot(absolute_path);
@@ -679,21 +672,22 @@ LTTNG_HIDDEN
 int utils_mkdir(const char *path, mode_t mode, int uid, int gid)
 {
        int ret;
-       struct lttng_directory_handle handle;
+       struct lttng_directory_handle *handle;
        const struct lttng_credentials creds = {
                .uid = (uid_t) uid,
                .gid = (gid_t) gid,
        };
 
-       ret = lttng_directory_handle_init(&handle, NULL);
-       if (ret) {
+       handle = lttng_directory_handle_create(NULL);
+       if (!handle) {
+               ret = -1;
                goto end;
        }
        ret = lttng_directory_handle_create_subdirectory_as_user(
-                       &handle, path, mode,
+                       handle, path, mode,
                        (uid >= 0 || gid >= 0) ? &creds : NULL);
-       lttng_directory_handle_fini(&handle);
 end:
+       lttng_directory_handle_put(handle);
        return ret;
 }
 
@@ -707,21 +701,22 @@ LTTNG_HIDDEN
 int utils_mkdir_recursive(const char *path, mode_t mode, int uid, int gid)
 {
        int ret;
-       struct lttng_directory_handle handle;
+       struct lttng_directory_handle *handle;
        const struct lttng_credentials creds = {
                .uid = (uid_t) uid,
                .gid = (gid_t) gid,
        };
 
-       ret = lttng_directory_handle_init(&handle, NULL);
-       if (ret) {
+       handle = lttng_directory_handle_create(NULL);
+       if (!handle) {
+               ret = -1;
                goto end;
        }
        ret = lttng_directory_handle_create_subdirectory_recursive_as_user(
-                       &handle, path, mode,
+                       handle, path, mode,
                        (uid >= 0 || gid >= 0) ? &creds : NULL);
-       lttng_directory_handle_fini(&handle);
 end:
+       lttng_directory_handle_put(handle);
        return ret;
 }
 
@@ -739,7 +734,8 @@ int utils_stream_file_path(const char *path_name, const char *file_name,
         char count_str[MAX_INT_DEC_LEN(count) + 1] = {};
        const char *path_separator;
 
-       if (path_name && path_name[strlen(path_name) - 1] == '/') {
+       if (path_name && (path_name[0] == '\0' ||
+                       path_name[strlen(path_name) - 1] == '/')) {
                path_separator = "";
        } else {
                path_separator = "/";
@@ -1011,7 +1007,7 @@ static inline unsigned int fls_u32(uint32_t x)
 #define HAS_FLS_U32
 #endif
 
-#if defined(__x86_64)
+#if defined(__x86_64) && defined(__LP64__)
 static inline
 unsigned int fls_u64(uint64_t x)
 {
@@ -1350,15 +1346,16 @@ LTTNG_HIDDEN
 int utils_recursive_rmdir(const char *path)
 {
        int ret;
-       struct lttng_directory_handle handle;
+       struct lttng_directory_handle *handle;
 
-       ret = lttng_directory_handle_init(&handle, NULL);
-       if (ret) {
+       handle = lttng_directory_handle_create(NULL);
+       if (!handle) {
+               ret = -1;
                goto end;
        }
-       ret = lttng_directory_handle_remove_subdirectory(&handle, path);
-       lttng_directory_handle_fini(&handle);
+       ret = lttng_directory_handle_remove_subdirectory(handle, path);
 end:
+       lttng_directory_handle_put(handle);
        return ret;
 }
 
@@ -1498,3 +1495,35 @@ int utils_get_memory_total(size_t *value)
 {
        return read_proc_meminfo_field(PROC_MEMINFO_MEMTOTAL_LINE, value);
 }
+
+LTTNG_HIDDEN
+int utils_change_working_directory(const char *path)
+{
+       int ret;
+
+       assert(path);
+
+       DBG("Changing working directory to \"%s\"", path);
+       ret = chdir(path);
+       if (ret) {
+               PERROR("Failed to change working directory to \"%s\"", path);
+               goto end;
+       }
+
+       /* Check for write access */
+       if (access(path, W_OK)) {
+               if (errno == EACCES) {
+                       /*
+                        * Do not treat this as an error since the permission
+                        * might change in the lifetime of the process
+                        */
+                       DBG("Working directory \"%s\" is not writable", path);
+               } else {
+                       PERROR("Failed to check if working directory \"%s\" is writable",
+                                       path);
+               }
+       }
+
+end:
+       return ret;
+}