X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Frunas.c;h=4bb45b0453ceba40f6e219d84b14d5b01792479b;hb=a0377dfefe40662ba7d68617bce6ff467114136c;hp=ab43423b1a3fd86ff798d45fb825a4b6e2392dba;hpb=37ccf8ecee70257a97ab6939e5dcb0112826f409;p=lttng-tools.git

diff --git a/src/common/runas.c b/src/common/runas.c
index ab43423b1..4bb45b045 100644
--- a/src/common/runas.c
+++ b/src/common/runas.c
@@ -8,7 +8,6 @@
  */
 
 #define _LGPL_SOURCE
-#include <assert.h>
 #include <fcntl.h>
 #include <grp.h>
 #include <limits.h>
@@ -907,14 +906,15 @@ static int get_user_infos_from_uid(
 {
 	int ret;
 	char *buf = NULL;
-	size_t buf_size;
+	long raw_get_pw_buf_size;
+	size_t get_pw_buf_size;
 	struct passwd pwd;
 	struct passwd *result = NULL;
 
 	/* Fetch the max size for the temporary buffer. */
 	errno = 0;
-	buf_size = sysconf(_SC_GETPW_R_SIZE_MAX);
-	if (buf_size < 0) {
+	raw_get_pw_buf_size = sysconf(_SC_GETPW_R_SIZE_MAX);
+	if (raw_get_pw_buf_size < 0) {
 		if (errno != 0) {
 			PERROR("Failed to query _SC_GETPW_R_SIZE_MAX");
 			goto error;
@@ -923,16 +923,18 @@ static int get_user_infos_from_uid(
 		/* Limit is indeterminate. */
 		WARN("Failed to query _SC_GETPW_R_SIZE_MAX as it is "
 			"indeterminate; falling back to default buffer size");
-		buf_size = GETPW_BUFFER_FALLBACK_SIZE;
+		raw_get_pw_buf_size = GETPW_BUFFER_FALLBACK_SIZE;
 	}
 
-	buf = zmalloc(buf_size);
+	get_pw_buf_size = (size_t) raw_get_pw_buf_size;
+
+	buf = zmalloc(get_pw_buf_size);
 	if (buf == NULL) {
 		PERROR("Failed to allocate buffer to get password file entries");
 		goto error;
 	}
 
-	ret = getpwuid_r(uid, &pwd, buf, buf_size, &result);
+	ret = getpwuid_r(uid, &pwd, buf, get_pw_buf_size, &result);
 	if (ret < 0) {
 		PERROR("Failed to get user information for user:  uid = %d",
 				(int) uid);
@@ -1101,8 +1103,8 @@ int handle_one_cmd(struct run_as_worker *worker)
 	ssize_t readlen, writelen;
 	struct run_as_ret sendret = {};
 	run_as_fct cmd;
-	uid_t prev_ruid;
-	gid_t prev_rgid;
+	const uid_t prev_ruid = getuid();
+	const gid_t prev_rgid = getgid();
 
 	/*
 	 * Stage 1: Receive run_as_data struct from the master.
@@ -1140,9 +1142,6 @@ int handle_one_cmd(struct run_as_worker *worker)
 		goto end;
 	}
 
-	prev_ruid = getuid();
-	prev_rgid = getgid();
-
 	ret = demote_creds(prev_ruid, prev_rgid, data.uid, data.gid);
 	if (ret < 0) {
 		goto write_return;
@@ -1448,7 +1447,7 @@ int run_as_create_worker_no_lock(const char *procname,
 	struct run_as_ret recvret;
 	struct run_as_worker *worker;
 
-	assert(!global_worker);
+	LTTNG_ASSERT(!global_worker);
 	if (!use_clone()) {
 		/*
 		 * Don't initialize a worker, all run_as tasks will be performed
@@ -1642,7 +1641,7 @@ int run_as(enum run_as_cmd cmd, struct run_as_data *data,
 	if (use_clone()) {
 		DBG("Using run_as worker");
 
-		assert(global_worker);
+		LTTNG_ASSERT(global_worker);
 
 		ret = run_as_cmd(global_worker, cmd, data, ret_value, uid, gid);
 		saved_errno = ret_value->_errno;