X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Frunas.c;h=43b154f10869de2e85a57bb7bcc03c7bb646bb72;hp=7de566ddb9fce211bb0db34d3c95c24a7cf6b3af;hb=8809eec0bb55b03862cb1eb128eb39d50104c258;hpb=1e4035fc898a56dc606ba8f5ce856763860d0309

diff --git a/src/common/runas.c b/src/common/runas.c
index 7de566ddb..43b154f10 100644
--- a/src/common/runas.c
+++ b/src/common/runas.c
@@ -153,13 +153,14 @@ int _open(void *_data)
 static
 int child_run_as(void *_data)
 {
+	int ret;
 	struct run_as_data *data = _data;
-	size_t writelen, writeleft, index;
+	ssize_t writelen;
+	size_t writeleft, index;
 	union {
 		int i;
 		char c[sizeof(int)];
 	} sendret;
-	int ret;
 
 	/*
 	 * Child: it is safe to drop egid and euid while sharing the
@@ -191,8 +192,10 @@ int child_run_as(void *_data)
 	writeleft = sizeof(sendret);
 	index = 0;
 	do {
-		writelen = write(data->retval_pipe, &sendret.c[index],
-				writeleft);
+		do {
+			writelen = write(data->retval_pipe, &sendret.c[index],
+					writeleft);
+		} while (writelen < 0 && errno == EINTR);
 		if (writelen < 0) {
 			PERROR("write");
 			return EXIT_FAILURE;
@@ -317,8 +320,13 @@ static
 int run_as(int (*cmd)(void *data), void *data, uid_t uid, gid_t gid)
 {
 	if (!getenv("LTTNG_DEBUG_NOCLONE")) {
+		int ret;
+
 		DBG("Using run_as_clone");
-		return run_as_clone(cmd, data, uid, gid);
+		pthread_mutex_lock(&lttng_libc_state_lock);
+		ret = run_as_clone(cmd, data, uid, gid);
+		pthread_mutex_unlock(&lttng_libc_state_lock);
+		return ret;
 	} else {
 		DBG("Using run_as_noclone");
 		return run_as_noclone(cmd, data, uid, gid);