X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=tests%2Fust-multi-test%2Fust-multi-test.c;h=011374395fc4ef5350ff728783f31db8839755e9;hb=6b8cdda9e4d87e9dee0b887ac733577b26be0ad3;hp=6f277a2176f28e016be2588c875ea8065e1e7829;hpb=94ec8e331f91214a23fd99a6ca6b773c2fa4d362;p=lttng-ust.git

diff --git a/tests/ust-multi-test/ust-multi-test.c b/tests/ust-multi-test/ust-multi-test.c
index 6f277a21..01137439 100644
--- a/tests/ust-multi-test/ust-multi-test.c
+++ b/tests/ust-multi-test/ust-multi-test.c
@@ -638,11 +638,19 @@ error:
 
 int update_futex(int fd, int active)
 {
-	size_t mmap_size = sysconf(_SC_PAGE_SIZE);
+	long page_size;
 	char *wait_shm_mmap;
 	int ret;
 
-	wait_shm_mmap = mmap(NULL, mmap_size, PROT_READ | PROT_WRITE,
+	page_size = sysconf(_SC_PAGE_SIZE);
+	if (page_size <= 0) {
+		if (!page_size) {
+			errno = EINVAL;
+		}
+		perror("Error in sysconf(_SC_PAGE_SIZE)");
+		goto error;
+	}
+	wait_shm_mmap = mmap(NULL, page_size, PROT_READ | PROT_WRITE,
 		  MAP_SHARED, fd, 0);
 	if (wait_shm_mmap == MAP_FAILED) {
 		perror("mmap");
@@ -651,12 +659,15 @@ int update_futex(int fd, int active)
 
 	if (active) {
 		uatomic_set((int32_t *) wait_shm_mmap, 1);
-		futex_async((int32_t *) wait_shm_mmap, FUTEX_WAKE,
-				INT_MAX, NULL, NULL, 0);
+		if (futex_async((int32_t *) wait_shm_mmap, FUTEX_WAKE,
+				INT_MAX, NULL, NULL, 0) < 0) {
+			perror("futex_async");
+			goto error;
+		}
 	} else {
 		uatomic_set((int32_t *) wait_shm_mmap, 0);
 	}
-	ret = munmap(wait_shm_mmap, mmap_size);
+	ret = munmap(wait_shm_mmap, page_size);
 	if (ret) {
 		perror("Error unmapping wait shm");
 		goto error;
@@ -699,6 +710,7 @@ int main(int argc, char **argv)
 	int ret, wait_shm_fd;
 	struct sigaction act;
 	mode_t old_umask = 0;
+	long page_size;
 
 	set_ulimit();
 
@@ -731,6 +743,15 @@ int main(int argc, char **argv)
 		return -1;
 	}
 
+	page_size = sysconf(_SC_PAGE_SIZE);
+	if (page_size <= 0) {
+		if (!page_size) {
+			errno = EINVAL;
+		}
+		perror("Error in sysconf(_SC_PAGE_SIZE)");
+		return -1;
+	}
+
 	if (geteuid() == 0) {
 		ret = mkdir(LTTNG_RUNDIR, S_IRWXU | S_IRWXG | S_IROTH | S_IXOTH);
 		if (ret && errno != EEXIST) {
@@ -738,7 +759,7 @@ int main(int argc, char **argv)
 			return -1;
 		}
 		wait_shm_fd = get_wait_shm(DEFAULT_GLOBAL_APPS_WAIT_SHM_PATH,
-					sysconf(_SC_PAGE_SIZE), 1);
+					page_size, 1);
 		if (wait_shm_fd < 0) {
 			perror("global wait shm error");
 			return -1;
@@ -764,7 +785,7 @@ int main(int argc, char **argv)
 		snprintf(local_apps_wait_shm_path, PATH_MAX,
 			 DEFAULT_HOME_APPS_WAIT_SHM_PATH, getuid());
 		wait_shm_fd = get_wait_shm(local_apps_wait_shm_path,
-					sysconf(_SC_PAGE_SIZE), 0);
+					page_size, 0);
 		if (wait_shm_fd < 0) {
 			perror("local wait shm error");
 			return -1;