X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Frunas.c;h=cdb10e57c34e41123f759e552f799065536829f4;hp=edbd70decc783ae3d00ec64fdb5d5736f79d706d;hb=f4d0bb2e92e94cb5eb304c8e92afcc804591539d;hpb=cd89f030a3f4bbdc9a61a8d3e2e92089468f6de7

diff --git a/src/common/runas.c b/src/common/runas.c
index edbd70dec..cdb10e57c 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;
@@ -420,8 +419,7 @@ end:
  * This is for debugging ONLY and should not be considered secure.
  */
 static
-int run_as_noworker(enum run_as_cmd cmd,
-		struct run_as_data *data, uid_t uid, gid_t gid)
+int run_as_noworker(enum run_as_cmd cmd, struct run_as_data *data)
 {
 	int ret, saved_errno;
 	mode_t old_mask;
@@ -456,7 +454,7 @@ int run_as(enum run_as_cmd cmd, struct run_as_data *data, uid_t uid, gid_t gid)
 
 	} else {
 		DBG("Using run_as without worker");
-		ret = run_as_noworker(cmd, data, uid, gid);
+		ret = run_as_noworker(cmd, data);
 	}
 	return ret;
 }
@@ -466,6 +464,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 +478,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 +487,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 +507,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);
@@ -560,10 +558,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