X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=src%2Fcommon%2Futils.c;h=2473ca39ef24b755fa6054ea4c1eb9abf2c9a2eb;hb=4da99cdcb3c8258a4e71928cee04614d821e46a7;hp=9fcceab1f3149c2c5e17a3e68d4ee1b60fc4932c;hpb=7565586a9441b2c3eb5dbc323e78933e0cebbdd5;p=lttng-tools.git

diff --git a/src/common/utils.c b/src/common/utils.c
index 9fcceab1f..2473ca39e 100644
--- a/src/common/utils.c
+++ b/src/common/utils.c
@@ -176,6 +176,10 @@ char *utils_partial_realpath(const char *path, char *resolved_path, size_t size)
 error:
 	free(resolved_path);
 	free(cut_path);
+	free(try_path);
+	if (try_path_prev != try_path) {
+		free(try_path_prev);
+	}
 	return NULL;
 }
 
@@ -533,6 +537,44 @@ error:
 	return fd;
 }
 
+/*
+ * On some filesystems (e.g. nfs), mkdir will validate access rights before
+ * checking for the existence of the path element. This means that on a setup
+ * where "/home/" is a mounted NFS share, and running as an unpriviledged user,
+ * recursively creating a path of the form "/home/my_user/trace/" will fail with
+ * EACCES on mkdir("/home", ...).
+ *
+ * Performing a stat(...) on the path to check for existence allows us to
+ * work around this behaviour.
+ */
+static
+int mkdir_check_exists(const char *path, mode_t mode)
+{
+	int ret = 0;
+	struct stat st;
+
+	ret = stat(path, &st);
+	if (ret == 0) {
+		if (S_ISDIR(st.st_mode)) {
+			/* Directory exists, skip. */
+			goto end;
+		} else {
+			/* Exists, but is not a directory. */
+			errno = ENOTDIR;
+			ret = -1;
+			goto end;
+		}
+	}
+
+	/*
+	 * Let mkdir handle other errors as the caller expects mkdir
+	 * semantics.
+	 */
+	ret = mkdir(path, mode);
+end:
+	return ret;
+}
+
 /*
  * Create directory using the given path and mode.
  *
@@ -544,7 +586,7 @@ int utils_mkdir(const char *path, mode_t mode, int uid, int gid)
 	int ret;
 
 	if (uid < 0 || gid < 0) {
-		ret = mkdir(path, mode);
+		ret = mkdir_check_exists(path, mode);
 	} else {
 		ret = run_as_mkdir(path, mode, uid, gid);
 	}
@@ -599,9 +641,9 @@ int _utils_mkdir_recursive_unsafe(const char *path, mode_t mode)
 				ret = -1;
 				goto error;
 			}
-			ret = mkdir(tmp, mode);
+			ret = mkdir_check_exists(tmp, mode);
 			if (ret < 0) {
-				if (errno != EEXIST) {
+				if (errno != EACCES) {
 					PERROR("mkdir recursive");
 					ret = -errno;
 					goto error;
@@ -611,14 +653,10 @@ int _utils_mkdir_recursive_unsafe(const char *path, mode_t mode)
 		}
 	}
 
-	ret = mkdir(tmp, mode);
+	ret = mkdir_check_exists(tmp, mode);
 	if (ret < 0) {
-		if (errno != EEXIST) {
-			PERROR("mkdir recursive last element");
-			ret = -errno;
-		} else {
-			ret = 0;
-		}
+		PERROR("mkdir recursive last element");
+		ret = -errno;
 	}
 
 error:
@@ -798,6 +836,7 @@ int utils_rotate_stream_file(char *path_name, char *file_name, uint64_t size,
 		PERROR("Closing tracefile");
 		goto error;
 	}
+	*stream_fd = -1;
 
 	if (count > 0) {
 		/*