X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Frunas.c;h=d75eb21027ce0ae2b7df768698d8c913bb4297ea;hp=e0c317c4e40347fb7001b74fb9900e9bcfafe32f;hb=3fd15a7429ca3f5307a783e264155ae0218511ec;hpb=52b07d8a5f38946bea3176d486c1934ca7639415

diff --git a/src/common/runas.c b/src/common/runas.c
index e0c317c4e..d75eb2102 100644
--- a/src/common/runas.c
+++ b/src/common/runas.c
@@ -2,18 +2,18 @@
  * Copyright (C) 2011 - David Goulet <david.goulet@polymtl.ca>
  *                      Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation; only version 2 of the License.
+ * 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.
  *
  * 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
+ * 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., 59 Temple
- * Place - Suite 330, Boston, MA  02111-1307, USA.
+ * 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 _GNU_SOURCE
@@ -31,6 +31,7 @@
 #include <sys/signal.h>
 
 #include <common/error.h>
+#include <common/utils.h>
 #include <common/compat/mman.h>
 #include <common/compat/clone.h>
 
@@ -38,6 +39,10 @@
 
 #define RUNAS_CHILD_STACK_SIZE	10485760
 
+#ifndef MAP_STACK
+#define MAP_STACK		0
+#endif
+
 #ifdef __FreeBSD__
 /* FreeBSD MAP_STACK always return -ENOMEM */
 #define LTTNG_MAP_STACK		0
@@ -80,56 +85,12 @@ int _mkdir_recursive(void *_data)
 {
 	struct run_as_mkdir_data *data = _data;
 	const char *path;
-	char *p, tmp[PATH_MAX];
-	struct stat statbuf;
 	mode_t mode;
-	size_t len;
-	int ret;
 
 	path = data->path;
 	mode = data->mode;
 
-	ret = snprintf(tmp, sizeof(tmp), "%s", path);
-	if (ret < 0) {
-		PERROR("snprintf mkdir");
-		goto error;
-	}
-
-	len = ret;
-	if (tmp[len - 1] == '/') {
-		tmp[len - 1] = 0;
-	}
-
-	for (p = tmp + 1; *p; p++) {
-		if (*p == '/') {
-			*p = 0;
-			ret = stat(tmp, &statbuf);
-			if (ret < 0) {
-				ret = mkdir(tmp, mode);
-				if (ret < 0) {
-					if (!(errno == EEXIST)) {
-						PERROR("mkdir recursive");
-						ret = -errno;
-						goto error;
-					}
-				}
-			}
-			*p = '/';
-		}
-	}
-
-	ret = mkdir(tmp, mode);
-	if (ret < 0) {
-		if (!(errno == EEXIST)) {
-			PERROR("mkdir recursive last piece");
-			ret = -errno;
-		} else {
-			ret = 0;
-		}
-	}
-
-error:
-	return ret;
+	return utils_mkdir_recursive(path, mode);
 }
 
 static
@@ -149,13 +110,14 @@ int _open(void *_data)
 static
 int child_run_as(void *_data)
 {
+	int ret;
 	struct run_as_data *data = _data;
-	size_t writelen, writeleft, index;
+	ssize_t writelen;
+	size_t writeleft, index;
 	union {
 		int i;
 		char c[sizeof(int)];
 	} sendret;
-	int ret;
 
 	/*
 	 * Child: it is safe to drop egid and euid while sharing the
@@ -187,8 +149,10 @@ int child_run_as(void *_data)
 	writeleft = sizeof(sendret);
 	index = 0;
 	do {
-		writelen = write(data->retval_pipe, &sendret.c[index],
-				writeleft);
+		do {
+			writelen = write(data->retval_pipe, &sendret.c[index],
+					writeleft);
+		} while (writelen < 0 && errno == EINTR);
 		if (writelen < 0) {
 			PERROR("write");
 			return EXIT_FAILURE;
@@ -306,21 +270,34 @@ end:
 static
 int run_as_noclone(int (*cmd)(void *data), void *data, uid_t uid, gid_t gid)
 {
-	return cmd(data);
+	int ret;
+	mode_t old_mask;
+
+	old_mask = umask(0);
+	ret = cmd(data);
+	umask(old_mask);
+
+	return ret;
 }
 
 static
 int run_as(int (*cmd)(void *data), void *data, uid_t uid, gid_t gid)
 {
 	if (!getenv("LTTNG_DEBUG_NOCLONE")) {
+		int ret;
+
 		DBG("Using run_as_clone");
-		return run_as_clone(cmd, data, uid, gid);
+		pthread_mutex_lock(&lttng_libc_state_lock);
+		ret = run_as_clone(cmd, data, uid, gid);
+		pthread_mutex_unlock(&lttng_libc_state_lock);
+		return ret;
 	} else {
 		DBG("Using run_as_noclone");
 		return run_as_noclone(cmd, data, uid, gid);
 	}
 }
 
+__attribute__((visibility("hidden")))
 int run_as_mkdir_recursive(const char *path, mode_t mode, uid_t uid, gid_t gid)
 {
 	struct run_as_mkdir_data data;
@@ -332,6 +309,7 @@ int run_as_mkdir_recursive(const char *path, mode_t mode, uid_t uid, gid_t gid)
 	return run_as(_mkdir_recursive, &data, uid, gid);
 }
 
+__attribute__((visibility("hidden")))
 int run_as_mkdir(const char *path, mode_t mode, uid_t uid, gid_t gid)
 {
 	struct run_as_mkdir_data data;
@@ -347,6 +325,7 @@ int run_as_mkdir(const char *path, mode_t mode, uid_t uid, gid_t gid)
  * Note: open_run_as is currently not working. We'd need to pass the fd
  * opened in the child to the parent.
  */
+__attribute__((visibility("hidden")))
 int run_as_open(const char *path, int flags, mode_t mode, uid_t uid, gid_t gid)
 {
 	struct run_as_open_data data;