X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fcommon%2Frunas.c;h=9e3b5ec3395d823d301b5ee1b8bed7f83f20bfe6;hb=9a642a3f53dfc3deab8196945d0b3762f4641200;hp=bc7356b6a6641b9d28a83d1171081a1d0b2ab7d9;hpb=b8090274814e5f6a22cff0dd656e14769cc7a7df;p=lttng-tools.git

diff --git a/src/common/runas.c b/src/common/runas.c
index bc7356b6a..9e3b5ec33 100644
--- a/src/common/runas.c
+++ b/src/common/runas.c
@@ -16,7 +16,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#define _GNU_SOURCE
 #define _LGPL_SOURCE
 #include <errno.h>
 #include <limits.h>
@@ -29,14 +28,16 @@
 #include <unistd.h>
 #include <fcntl.h>
 #include <sched.h>
-#include <sys/signal.h>
+#include <signal.h>
 #include <assert.h>
-#include <sys/prctl.h>
+#include <signal.h>
 
 #include <common/common.h>
 #include <common/utils.h>
 #include <common/compat/getenv.h>
-#include <common/sessiond-comm/unix.h>
+#include <common/compat/prctl.h>
+#include <common/unix.h>
+#include <common/defaults.h>
 
 #include "runas.h"
 
@@ -170,7 +171,7 @@ run_as_fct run_as_enum_to_fct(enum run_as_cmd cmd)
 	case RUN_AS_MKDIR_RECURSIVE:
 		return _mkdir_recursive;
 	default:
-		ERR("Unknown command %d", (int) cmd)
+		ERR("Unknown command %d", (int) cmd);
 		return NULL;
 	}
 }
@@ -323,11 +324,11 @@ int run_as_worker(struct run_as_worker *worker)
 	memset(worker->procname, 0, proc_orig_len);
 	strncpy(worker->procname, DEFAULT_RUN_AS_WORKER_NAME, proc_orig_len);
 
-	ret = prctl(PR_SET_NAME, DEFAULT_RUN_AS_WORKER_NAME, 0, 0, 0);
-	if (ret) {
+	ret = lttng_prctl(PR_SET_NAME,
+			(unsigned long) DEFAULT_RUN_AS_WORKER_NAME, 0, 0, 0);
+	if (ret && ret != -ENOSYS) {
 		/* Don't fail as this is not essential. */
 		PERROR("prctl PR_SET_NAME");
-		ret = 0;
 	}
 
 	sendret.ret = 0;
@@ -373,7 +374,7 @@ int run_as_cmd(struct run_as_worker *worker,
 			recvret.ret = -1;
 			recvret._errno = EPERM;
 			ERR("Client (%d)/Server (%d) UID mismatch (and sessiond is not root)",
-				uid, geteuid());
+				(int) uid, (int) geteuid());
 			goto end;
 		}
 	}
@@ -464,8 +465,9 @@ int run_as_mkdir_recursive(const char *path, mode_t mode, uid_t uid, gid_t gid)
 {
 	struct run_as_data data;
 
+	memset(&data, 0, sizeof(data));
 	DBG3("mkdir() recursive %s with mode %d for uid %d and gid %d",
-			path, mode, uid, gid);
+			path, (int) mode, (int) uid, (int) gid);
 	strncpy(data.u.mkdir.path, path, PATH_MAX - 1);
 	data.u.mkdir.path[PATH_MAX - 1] = '\0';
 	data.u.mkdir.mode = mode;
@@ -477,25 +479,23 @@ int run_as_mkdir(const char *path, mode_t mode, uid_t uid, gid_t gid)
 {
 	struct run_as_data data;
 
+	memset(&data, 0, sizeof(data));
 	DBG3("mkdir() %s with mode %d for uid %d and gid %d",
-			path, mode, uid, gid);
+			path, (int) mode, (int) uid, (int) gid);
 	strncpy(data.u.mkdir.path, path, PATH_MAX - 1);
 	data.u.mkdir.path[PATH_MAX - 1] = '\0';
 	data.u.mkdir.mode = mode;
 	return run_as(RUN_AS_MKDIR, &data, uid, gid);
 }
 
-/*
- * Note: open_run_as is currently not working. We'd need to pass the fd
- * opened in the child to the parent.
- */
 LTTNG_HIDDEN
 int run_as_open(const char *path, int flags, mode_t mode, uid_t uid, gid_t gid)
 {
 	struct run_as_data data;
 
+	memset(&data, 0, sizeof(data));
 	DBG3("open() %s with flags %X mode %d for uid %d and gid %d",
-			path, flags, mode, uid, gid);
+			path, flags, (int) mode, (int) uid, (int) gid);
 	strncpy(data.u.open.path, path, PATH_MAX - 1);
 	data.u.open.path[PATH_MAX - 1] = '\0';
 	data.u.open.flags = flags;
@@ -508,8 +508,9 @@ int run_as_unlink(const char *path, uid_t uid, gid_t gid)
 {
 	struct run_as_data data;
 
+	memset(&data, 0, sizeof(data));
 	DBG3("unlink() %s with for uid %d and gid %d",
-			path, uid, gid);
+			path, (int) uid, (int) gid);
 	strncpy(data.u.unlink.path, path, PATH_MAX - 1);
 	data.u.unlink.path[PATH_MAX - 1] = '\0';
 	return run_as(RUN_AS_UNLINK, &data, uid, gid);
@@ -521,7 +522,7 @@ int run_as_rmdir_recursive(const char *path, uid_t uid, gid_t gid)
 	struct run_as_data data;
 
 	DBG3("rmdir_recursive() %s with for uid %d and gid %d",
-			path, uid, gid);
+			path, (int) uid, (int) gid);
 	strncpy(data.u.rmdir_recursive.path, path, PATH_MAX - 1);
 	data.u.rmdir_recursive.path[PATH_MAX - 1] = '\0';
 	return run_as(RUN_AS_RMDIR_RECURSIVE, &data, uid, gid);
@@ -530,22 +531,13 @@ int run_as_rmdir_recursive(const char *path, uid_t uid, gid_t gid)
 static
 int reset_sighandler(void)
 {
-	int sig, ret = 0;
+	int sig;
 
 	DBG("Resetting run_as worker signal handlers to default");
-	for (sig = SIGHUP; sig <= SIGUNUSED; sig++) {
-		/* Skip unblockable signals. */
-		if (sig == SIGKILL || sig == SIGSTOP) {
-			continue;
-		}
-		if (signal(sig, SIG_DFL) == SIG_ERR) {
-			PERROR("reset signal %d", sig);
-			ret = -1;
-			goto end;
-		}
+	for (sig = 1; sig <= 31; sig++) {
+		(void) signal(sig, SIG_DFL);
 	}
-end:
-	return ret;
+	return 0;
 }
 
 static
@@ -554,10 +546,10 @@ void worker_sighandler(int sig)
 	const char *signame;
 
 	/*
-	 * The worker will its parent's signals since they are part of the same
-	 * process group. However, in the case of SIGINT and SIGTERM, we want
-	 * to give the worker a chance to teardown gracefully when its parent
-	 * closes the command socket.
+	 * The worker will inherit its parent's signals since they are part of
+	 * the same process group. However, in the case of SIGINT and SIGTERM,
+	 * we want to give the worker a chance to teardown gracefully when its
+	 * parent closes the command socket.
 	 */
 	switch (sig) {
 	case SIGINT:
@@ -567,10 +559,14 @@ void worker_sighandler(int sig)
 		signame = "SIGTERM";
 		break;
 	default:
-		signame = "Unknown";
+		signame = NULL;
 	}
 
-	DBG("run_as worker received signal %s", signame);
+	if (signame) {
+		DBG("run_as worker received signal %s", signame);
+	} else {
+		DBG("run_as_worker received signal %d", sig);
+	}
 }
 
 static
@@ -660,6 +656,7 @@ int run_as_create_worker(char *procname)
 			ret = -1;
 		}
 		worker->sockpair[1] = -1;
+		free(worker);
 		LOG(ret ? PRINT_ERR : PRINT_DBG, "run_as worker exiting (ret = %d)", ret);
 		exit(ret ? EXIT_FAILURE : EXIT_SUCCESS);
 	} else {