From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Sat, 27 Aug 2011 21:50:41 +0000 (-0400)
Subject: wakeup shm: set permissions on shm
X-Git-Tag: v1.9.1~220
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=44e073f54f10c398cbe10c702a36915d414e5e62;p=lttng-ust.git

wakeup shm: set permissions on shm

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
---

diff --git a/libust/lttng-ust-comm.c b/libust/lttng-ust-comm.c
index 37527290..3ee862a0 100644
--- a/libust/lttng-ust-comm.c
+++ b/libust/lttng-ust-comm.c
@@ -81,6 +81,7 @@ struct sock_info {
 	int root_handle;
 	int constructor_sem_posted;
 	int allowed;
+	int global;
 
 	char sock_path[PATH_MAX];
 	int socket;
@@ -92,6 +93,7 @@ struct sock_info {
 /* Socket from app (connect) to session daemon (listen) for communication */
 struct sock_info global_apps = {
 	.name = "global",
+	.global = 1,
 
 	.root_handle = -1,
 	.allowed = 1,
@@ -106,6 +108,7 @@ struct sock_info global_apps = {
 
 struct sock_info local_apps = {
 	.name = "local",
+	.global = 0,
 	.root_handle = -1,
 	.allowed = 0,	/* Check setuid bit first */
 
@@ -311,13 +314,18 @@ char *get_map_shm(struct sock_info *sock_info)
 	size_t mmap_size = sysconf(_SC_PAGE_SIZE);
 	int wait_shm_fd, ret;
 	char *wait_shm_mmap;
+	int mode;
+
+	mode = S_IRUSR | S_IRGRP;
+	if (sock_info->global)
+		mode |= S_IROTH;
 
 	/*
 	 * Get existing (read-only) shm, or open new shm.
 	 * First try to open read-only.
 	 */
 	wait_shm_fd = shm_open(sock_info->wait_shm_path,
-			O_RDONLY, 0700);
+			O_RDONLY, mode);
 	if (wait_shm_fd >= 0)
 		goto got_shm;
 	/*
@@ -330,7 +338,7 @@ char *get_map_shm(struct sock_info *sock_info)
 		goto error;
 	}
 	wait_shm_fd = shm_open(sock_info->wait_shm_path,
-			O_RDWR | O_CREAT | O_EXCL, 0700);
+			O_RDWR | O_CREAT | O_EXCL, mode | S_IWUSR);
 	if (wait_shm_fd >= 0)
 		goto created_shm;
 	if (errno != EEXIST) {
@@ -343,7 +351,7 @@ char *get_map_shm(struct sock_info *sock_info)
 	 * read-only mode.
 	 */
 	wait_shm_fd = shm_open(sock_info->wait_shm_path,
-			O_RDWR | O_CREAT | O_EXCL, 0700);
+			O_RDWR | O_CREAT | O_EXCL, mode);
 	if (wait_shm_fd >= 0)
 		goto got_shm;
 	else
@@ -360,6 +368,11 @@ created_shm:
 		wait_shm_fd = -1;
 		goto error;
 	}
+	/* Drop write access ASAP */
+	ret = chmod(sock_info->wait_shm_path, mode);
+	if (ret) {
+		PERROR("chmod");
+	}
 got_shm:
 	wait_shm_mmap = mmap(NULL, mmap_size, PROT_READ,
 		  MAP_SHARED, wait_shm_fd, 0);