X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fcommon%2Frunas.c;h=debc95926e7d04fa7989ca8f62bc2b85e0e8aaf6;hb=f726677b9b3a5a384bb96ea4ef7d6f0c4b03524f;hp=3916d6754314eadd4947b576dbcb4d98273ad861;hpb=0ef0325590ac65995f926a031e2f085531f74090;p=lttng-tools.git

diff --git a/src/common/runas.c b/src/common/runas.c
index 3916d6754..debc95926 100644
--- a/src/common/runas.c
+++ b/src/common/runas.c
@@ -488,6 +488,9 @@ int handle_one_cmd(struct run_as_worker *worker)
 	run_as_fct cmd;
 	uid_t prev_euid;
 
+	memset(&sendret, 0, sizeof(sendret));
+	sendret.fd = -1;
+
 	/*
 	 * Stage 1: Receive run_as_data struct from the master.
 	 * The structure contains the command type and all the parameters needed for
@@ -528,6 +531,8 @@ int handle_one_cmd(struct run_as_worker *worker)
 	if (data.gid != getegid()) {
 		ret = setegid(data.gid);
 		if (ret < 0) {
+			sendret._error = true;
+			sendret._errno = errno;
 			PERROR("setegid");
 			goto write_return;
 		}
@@ -535,6 +540,8 @@ int handle_one_cmd(struct run_as_worker *worker)
 	if (data.uid != prev_euid) {
 		ret = seteuid(data.uid);
 		if (ret < 0) {
+			sendret._error = true;
+			sendret._errno = errno;
 			PERROR("seteuid");
 			goto write_return;
 		}
@@ -710,6 +717,7 @@ int run_as_cmd(struct run_as_worker *worker,
 		PERROR("Error reading response from run_as");
 		ret = -1;
 		ret_value->_errno = errno;
+		goto end;
 	}
 
 	/*
@@ -914,6 +922,9 @@ int run_as_extract_elf_symbol_offset(int fd, const char* function,
 	struct run_as_data data;
 	struct run_as_ret ret;
 
+	memset(&data, 0, sizeof(data));
+	memset(&ret, 0, sizeof(ret));
+
 	DBG3("extract_elf_symbol_offset() on fd=%d and function=%s "
 		"with for uid %d and gid %d", fd, function, (int) uid, (int) gid);
 
@@ -943,6 +954,9 @@ int run_as_extract_sdt_probe_offsets(int fd, const char* provider_name,
 	struct run_as_data data;
 	struct run_as_ret ret;
 
+	memset(&data, 0, sizeof(data));
+	memset(&ret, 0, sizeof(ret));
+
 	DBG3("extract_sdt_probe_offsets() on fd=%d, probe_name=%s and "
 		"provider_name=%s with for uid %d and gid %d", fd, probe_name,
 		provider_name, (int) uid, (int) gid);