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

diff --git a/src/common/runas.c b/src/common/runas.c
index 7a6be2837..9e3b5ec33 100644
--- a/src/common/runas.c
+++ b/src/common/runas.c
@@ -329,7 +329,6 @@ int run_as_worker(struct run_as_worker *worker)
 	if (ret && ret != -ENOSYS) {
 		/* Don't fail as this is not essential. */
 		PERROR("prctl PR_SET_NAME");
-		ret = 0;
 	}
 
 	sendret.ret = 0;
@@ -466,6 +465,7 @@ 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, (int) mode, (int) uid, (int) gid);
 	strncpy(data.u.mkdir.path, path, PATH_MAX - 1);
@@ -479,6 +479,7 @@ 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, (int) mode, (int) uid, (int) gid);
 	strncpy(data.u.mkdir.path, path, PATH_MAX - 1);
@@ -487,15 +488,12 @@ int run_as_mkdir(const char *path, mode_t mode, uid_t uid, gid_t gid)
 	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, (int) mode, (int) uid, (int) gid);
 	strncpy(data.u.open.path, path, PATH_MAX - 1);
@@ -510,6 +508,7 @@ 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, (int) uid, (int) gid);
 	strncpy(data.u.unlink.path, path, PATH_MAX - 1);
@@ -547,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:
@@ -560,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
@@ -653,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 {