X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=liblttng-ust%2Flttng-ust-comm.c;h=c619b5449dffafaa382927d63ff193656031bf02;hb=4721f9c7dc15670ecc9c2dcdd58d87eb2a2735a5;hp=7c746d8a712a2d30c271a016d92bec53673fb971;hpb=ee7fcec8c059c5b203d6aa5df7ceef414a55505c;p=lttng-ust.git

diff --git a/liblttng-ust/lttng-ust-comm.c b/liblttng-ust/lttng-ust-comm.c
index 7c746d8a..c619b544 100644
--- a/liblttng-ust/lttng-ust-comm.c
+++ b/liblttng-ust/lttng-ust-comm.c
@@ -114,8 +114,15 @@ static int lttng_ust_comm_should_quit;
 int ust_lock(void)
 {
 	sigset_t sig_all_blocked, orig_mask;
-	int ret;
+	int ret, oldstate;
 
+	ret = pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &oldstate);
+	if (ret) {
+		ERR("pthread_setcancelstate: %s", strerror(ret));
+	}
+	if (oldstate != PTHREAD_CANCEL_ENABLE) {
+		ERR("pthread_setcancelstate: unexpected oldstate");
+	}
 	sigfillset(&sig_all_blocked);
 	ret = pthread_sigmask(SIG_SETMASK, &sig_all_blocked, &orig_mask);
 	if (ret) {
@@ -143,8 +150,15 @@ int ust_lock(void)
 void ust_lock_nocheck(void)
 {
 	sigset_t sig_all_blocked, orig_mask;
-	int ret;
+	int ret, oldstate;
 
+	ret = pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &oldstate);
+	if (ret) {
+		ERR("pthread_setcancelstate: %s", strerror(ret));
+	}
+	if (oldstate != PTHREAD_CANCEL_ENABLE) {
+		ERR("pthread_setcancelstate: unexpected oldstate");
+	}
 	sigfillset(&sig_all_blocked);
 	ret = pthread_sigmask(SIG_SETMASK, &sig_all_blocked, &orig_mask);
 	if (ret) {
@@ -164,7 +178,7 @@ void ust_lock_nocheck(void)
 void ust_unlock(void)
 {
 	sigset_t sig_all_blocked, orig_mask;
-	int ret;
+	int ret, oldstate;
 
 	sigfillset(&sig_all_blocked);
 	ret = pthread_sigmask(SIG_SETMASK, &sig_all_blocked, &orig_mask);
@@ -177,6 +191,13 @@ void ust_unlock(void)
 	if (ret) {
 		ERR("pthread_sigmask: %s", strerror(ret));
 	}
+	ret = pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, &oldstate);
+	if (ret) {
+		ERR("pthread_setcancelstate: %s", strerror(ret));
+	}
+	if (oldstate != PTHREAD_CANCEL_DISABLE) {
+		ERR("pthread_setcancelstate: unexpected oldstate");
+	}
 }
 
 /*
@@ -308,6 +329,24 @@ extern void lttng_ring_buffer_client_discard_exit(void);
 extern void lttng_ring_buffer_client_discard_rt_exit(void);
 extern void lttng_ring_buffer_metadata_client_exit(void);
 
+ssize_t lttng_ust_read(int fd, void *buf, size_t len)
+{
+	ssize_t ret;
+	size_t copied = 0, to_copy = len;
+
+	do {
+		ret = read(fd, buf + copied, to_copy);
+		if (ret > 0) {
+			copied += ret;
+			to_copy -= ret;
+		}
+	} while ((ret > 0 && to_copy > 0)
+		|| (ret < 0 && errno == EINTR));
+	if (ret > 0) {
+		ret = copied;
+	}
+	return ret;
+}
 /*
  * Returns the HOME directory path. Caller MUST NOT free(3) the returned
  * pointer.
@@ -555,13 +594,13 @@ int handle_message(struct sock_info *sock_info,
 
 	if (ust_lock()) {
 		ret = -LTTNG_UST_ERR_EXITING;
-		goto end;
+		goto error;
 	}
 
 	ops = objd_ops(lum->handle);
 	if (!ops) {
 		ret = -ENOENT;
-		goto end;
+		goto error;
 	}
 
 	switch (lum->cmd) {
@@ -622,12 +661,12 @@ int handle_message(struct sock_info *sock_info,
 				}
 				ret = len;
 				free(bytecode);
-				goto end;
+				goto error;
 			} else {
 				DBG("incorrect filter data message size: %zd", len);
 				ret = -EINVAL;
 				free(bytecode);
-				goto end;
+				goto error;
 			}
 		}
 		bytecode->bc.len = lum->u.filter.data_size;
@@ -687,12 +726,12 @@ int handle_message(struct sock_info *sock_info,
 				}
 				ret = len;
 				free(node);
-				goto end;
+				goto error;
 			} else {
 				DBG("Incorrect exclusion data message size: %zd", len);
 				ret = -EINVAL;
 				free(node);
-				goto end;
+				goto error;
 			}
 		}
 		if (ops->cmd) {
@@ -733,11 +772,11 @@ int handle_message(struct sock_info *sock_info,
 					goto error;
 				}
 				ret = len;
-				goto end;
+				goto error;
 			} else {
 				DBG("incorrect channel data message size: %zd", len);
 				ret = -EINVAL;
-				goto end;
+				goto error;
 			}
 		}
 		args.channel.chan_data = chan_data;
@@ -758,7 +797,7 @@ int handle_message(struct sock_info *sock_info,
 			&args.stream.shm_fd,
 			&args.stream.wakeup_fd);
 		if (ret) {
-			goto end;
+			goto error;
 		}
 		if (ops->cmd)
 			ret = ops->cmd(lum->handle, lum->cmd,
@@ -778,7 +817,6 @@ int handle_message(struct sock_info *sock_info,
 		break;
 	}
 
-end:
 	lur.handle = lum->handle;
 	lur.cmd = lum->cmd;
 	lur.ret_val = ret;
@@ -910,7 +948,12 @@ void cleanup_sock_info(struct sock_info *sock_info, int exiting)
 		long page_size;
 
 		page_size = sysconf(_SC_PAGE_SIZE);
-		if (page_size > 0) {
+		if (page_size <= 0) {
+			if (!page_size) {
+				errno = EINVAL;
+			}
+			PERROR("Error in sysconf(_SC_PAGE_SIZE)");
+		} else {
 			ret = munmap(sock_info->wait_shm_mmap, page_size);
 			if (ret) {
 				ERR("Error unmapping wait shm");
@@ -1092,7 +1135,11 @@ char *get_map_shm(struct sock_info *sock_info)
 	char *wait_shm_mmap;
 
 	page_size = sysconf(_SC_PAGE_SIZE);
-	if (page_size < 0) {
+	if (page_size <= 0) {
+		if (!page_size) {
+			errno = EINVAL;
+		}
+		PERROR("Error in sysconf(_SC_PAGE_SIZE)");
 		goto error;
 	}
 
@@ -1199,8 +1246,9 @@ restart:
 			 * deals with a killed or broken session daemon.
 			 */
 			sleep(5);
+		} else {
+			has_waited = 1;
 		}
-		has_waited = 1;
 		prev_connect_failed = 0;
 	}
 
@@ -1379,7 +1427,13 @@ restart:
 			print_cmd(lum.cmd, lum.handle);
 			ret = handle_message(sock_info, sock, &lum);
 			if (ret) {
-				ERR("Error handling message for %s socket", sock_info->name);
+				ERR("Error handling message for %s socket",
+					sock_info->name);
+				/*
+				 * Close socket if protocol error is
+				 * detected.
+				 */
+				goto end;
 			}
 			continue;
 		default:
@@ -1561,9 +1615,7 @@ static
 void lttng_ust_cleanup(int exiting)
 {
 	cleanup_sock_info(&global_apps, exiting);
-	if (local_apps.allowed) {
-		cleanup_sock_info(&local_apps, exiting);
-	}
+	cleanup_sock_info(&local_apps, exiting);
 	/*
 	 * The teardown in this function all affect data structures
 	 * accessed under the UST lock by the listener thread. This